T13578 setup phalcon environment

.gitignore

@@ -48,7 +48,9 @@ autom4te.cache/
 /vendor
 /ide/
 
+boxfile.yml
 composer.lock
 php_test_results_*.txt
 docker-compose.yml
 build/gccarch
+tests/_cache

.travis.yml

@@ -5,16 +5,15 @@ php:
   - 'master'
   - '7.3'
   - '7.2'
-  - '7.1'
-  - '7.0'
 
 git:
   depth: 1
 
-branches:
-  only:
-    - master
-    - /^(4|5)\.\d+\.(\d+|x)$/
+# TODO - Remove this when we go deploy this
+#branches:
+#  only:
+#    - master
+#    - /^(4|5)\.\d+\.(\d+|x)$/
 
 addons:
   apt:
@@ -26,6 +25,7 @@ addons:
       - lcov
       - mysql-server
       - mysql-client
+  postgresql: "9.4"
 
 matrix:
   fast_finish: true
@@ -42,6 +42,7 @@ cache:
     - ${HOME}/.local/opt
 
 services:
+  - mysql
   - beanstalkd
   - mongodb
   - redis-server
@@ -50,7 +51,7 @@ services:
 env:
   global:
     - CC="gcc"
-    - ZEPHIR_VERSION="0.10.14"
+    - ZEPHIR_VERSION="0.11.8"
     - RE2C_VERSION="1.1.1"
     - REPORT_EXIT_STATUS=1
     - REPORT_COVERAGE=1
@@ -68,6 +69,8 @@ before_install:
   - tests/_ci/setup-dbs.sh
   - source tests/_ci/environment
   - export $(cut -d= -f1 tests/_ci/environment)
+  - wget --no-clobber -O $HOME/bin/zephir https://github.com/phalcon/zephir/releases/download/${ZEPHIR_VERSION}/zephir.phar
+  - chmod +x $HOME/bin/zephir
 
 install:
   - tests/_ci/install-prereqs.sh
@@ -84,9 +87,10 @@ script:
   - vendor/bin/phpcs
   - vendor/bin/codecept build
   # TODO: Add `cli' suite and refactor current cli-tests
+#  - vendor/bin/codecept run -v
+  - vendor/bin/codecept run -v -n tests/cli/
   - vendor/bin/codecept run -v -n tests/integration/
   - vendor/bin/codecept run -v -n tests/unit/
-  # TODO: Refactor legacy unit tests from the "unit-tests" directory
   - phpenv config-rm xdebug.ini || true
   - tests/_ci/volt-tests.sh
 

CHANGELOG-4.0.md

@@ -19,6 +19,7 @@
 - Added `Phalcon\Mvc\Model\Query\BuilderInterface::offset` [#13599](https://github.com/phalcon/cphalcon/pull/13599)
 - Added `Phalcon\Http\Response\Cookies::getCookies` [#13591](https://github.com/phalcon/cphalcon/pull/13591)
 - Added `Phalcon\Mvc\Model::isRelationshipLoaded` to check if relationship is loaded
+- Added an easy way to work with Phalcon and run the tests locally, using [nanobox.io](https://nanobox.io) [#13578](https://github.com/phalcon/cphalcon/issues/13578)
 
 ## Changed
 - By configuring `prefix` and `statsKey` the `Phalcon\Cache\Backend\Redis::queryKeys` no longer returns prefixed keys, now it returns original keys without prefix. [PR-13456](https://github.com/phalcon/cphalcon/pull/13456)
@@ -41,6 +42,7 @@
 - Changed `Phalcon\Tag::getTitle()`. It returns only the text. It accepts `prepend`, `append` booleans to prepend or append the relevant text to the title. [#13547](https://github.com/phalcon/cphalcon/issues/13547) 
 - Changed `Phalcon\Di\Service` constructor to no longer takes the name of the service.
 - Changed `Phalon\Tag::textArea` to use `htmlspecialchars` to prevent XSS injection. [#12428](https://github.com/phalcon/cphalcon/issues/12428)
+- Changed `Phalon\Cache\Backend\*::get` to use only positive numbers for `lifetime`
 
 ## Removed
 - PHP < 7.0 no longer supported
@@ -57,4 +59,12 @@
 - Removed `Phalcon\Validation\MessageInterface` and `Phalcon\Mvc\Model\MessageInterface` in favor of `Phalcon\Messages\MessageInterface`
 - Removed `Phalcon\Validation\Message` and `Phalcon\Mvc\Model\Message` in favor of `Phalcon\Messages\Message`
 - Removed `Phalcon\Validation\Message\Group` in favor of `Phalcon\Messages\Messages`
+- Removed deprecated `Phalcon\Annotations\Adapter\Apc`
+- Removed deprecated `Phalcon\Annotations\Adapter\Xcache`
+- Removed deprecated `Phalcon\Cache\Backend\Apc`
+- Removed deprecated `Phalcon\Cache\Backend\Memcache`
+- Removed deprecated `Phalcon\Cache\Backend\Xcache`
+- Removed deprecated `Phalcon\Mvc\Model\Metadata\Apc`
+- Removed deprecated `Phalcon\Mvc\Model\Metadata\Memcache`
+- Removed deprecated `Phalcon\Mvc\Model\Metadata\Xcache`
 

CHANGELOG.md

@@ -7,10 +7,10 @@ To see what we changed in particular framework branch refer to the relevant chan
 ## Index
 
 - [**`4.0.x`**](CHANGELOG-4.0.md)
-- [**`3.4.x`**](CHANGELOG-3.4.md)
-- [**`3.3.x`**](CHANGELOG-3.3.md)
-- [**`3.2.x`**](CHANGELOG-3.2.md)
-- [**`3.1.x`**](CHANGELOG-3.1.md)
-- [**`3.0.x`**](CHANGELOG-3.0.md)
-- [**`2.0.x`**](CHANGELOG-2.0.md)
-- [**`1.x.x`**](CHANGELOG-1.x.md)
+- [**`3.4.x`**](resources/CHANGELOG-3.4.md)
+- [**`3.3.x`**](resources/CHANGELOG-3.3.md)
+- [**`3.2.x`**](resources/CHANGELOG-3.2.md)
+- [**`3.1.x`**](resources/CHANGELOG-3.1.md)
+- [**`3.0.x`**](resources/CHANGELOG-3.0.md)
+- [**`2.0.x`**](resources/CHANGELOG-2.0.md)
+- [**`1.x.x`**](resources/CHANGELOG-1.x.md)

codeception.yml

@@ -1,5 +1,4 @@
-# can be changed while bootstrapping project
-actor: Tester
+actor_suffix: Tester
 
 paths:
     # where the modules stored
@@ -23,7 +22,7 @@ settings:
 
 coverage:
     # Disable Code Coverage by default to speed up Travis tests
-   enabled: false
+    enabled: false
 
 extensions:
     enabled:

composer.json

@@ -41,13 +41,12 @@
         "ext-psr": "*",
         "ext-xml": "*",
         "codeception/codeception": "^2.4",
-        "codeception/specify": "1.0.*",
-        "codeception/verify": "1.0.*",
         "mustache/mustache": "^2.11",
         "phpunit/phpunit": "^6.4",
         "predis/predis": "^1.1",
         "squizlabs/php_codesniffer": "^3.2",
-        "twig/twig": "~1.35"
+        "twig/twig": "~1.35",
+        "vlucas/phpdotenv": "^2.5"
     },
     "config": {
         "optimize-autoloader": true,
@@ -59,6 +58,7 @@
             "Zephir\\Optimizers\\": "optimizers/",
             "Phalcon\\Test\\Unit\\": "tests/unit/",
             "Phalcon\\Test\\Integration\\": "tests/integration/",
+            "Phalcon\\Test\\Fixtures\\": "tests/_data/fixtures/",
             "Phalcon\\Test\\Module\\": "tests/_support/Module/",
             "Phalcon\\Test\\Listener\\": "tests/_data/listener/",
             "Phalcon\\Test\\Db\\": "tests/_data/db/"

phalcon/acl/adapter.zep

@@ -49,19 +49,22 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface
 
 	/**
 	 * Role which the list is checking if it's allowed to certain resource/access
-	 * @var mixed
+	 *
+	 * @var string
 	 */
 	protected _activeRole { get };
 
 	/**
 	 * Resource which the list is checking if some role can access it
-	 * @var mixed
+	 *
+	 * @var string
 	 */
 	protected _activeResource { get };
 
 	/**
 	 * Active access which the list is checking if some role can access it
-	 * @var mixed
+	 *
+	 * @var string
 	 */
 	protected _activeAccess { get };
 

phalcon/acl/adapter/memory.zep

@@ -188,7 +188,7 @@ class Memory extends Adapter
 	 * @param  array|string         accessInherits
 	 * @param  RoleInterface|string|array role
 	 */
-	public function addRole(role, accessInherits = null) -> boolean
+	public function addRole(role, accessInherits = null) -> bool
 	{
 		var roleName, roleObject;
 
@@ -229,7 +229,7 @@ class Memory extends Adapter
      * @param  array|string         accessInherits
      * @param  RoleInterface|string|array role
      */
-	public function addInherit(string roleName, var roleToInherits) -> boolean
+	public function addInherit(string roleName, var roleToInherits) -> bool
 	{
 		var roleInheritName, rolesNames, roleToInherit, checkRoleToInherit,
 		 checkRoleToInherits, usedRoleToInherits, roleToInheritList, usedRoleToInherit;
@@ -313,15 +313,15 @@ class Memory extends Adapter
 	/**
 	 * Check whether role exist in the roles list
 	 */
-	public function isRole(string roleName) -> boolean
+	public function isRole(string roleName) -> bool
 	{
 		return isset this->_rolesNames[roleName];
 	}
 
 	/**
 	 * Check whether resource exist in the resources list
 	 */
-	public function isResource(string resourceName) -> boolean
+	public function isResource(string resourceName) -> bool
 	{
 		return isset this->_resourcesNames[resourceName];
 	}
@@ -363,7 +363,7 @@ class Memory extends Adapter
 	 * @param   Phalcon\Acl\Resource|string resourceValue
 	 * @param   array|string accessList
 	 */
-	public function addResource(var resourceValue, var accessList) -> boolean
+	public function addResource(var resourceValue, var accessList) -> bool
 	{
 		var resourceName, resourceObject;
 
@@ -388,7 +388,7 @@ class Memory extends Adapter
 	 *
 	 * @param array|string accessList
 	 */
-	public function addResourceAccess(string resourceName, var accessList) -> boolean
+	public function addResourceAccess(string resourceName, var accessList) -> bool
 	{
 		var accessName, accessKey, exists;
 
@@ -581,7 +581,7 @@ class Memory extends Adapter
 	 * @param  RoleInterface|RoleAware|string roleName
 	 * @param  ResourceInterface|ResourceAware|string resourceName
 	 */
-	public function isAllowed(var roleName, var resourceName, string access, array parameters = null) -> boolean
+	public function isAllowed(var roleName, var resourceName, string access, array parameters = null) -> bool
 	{
 		var eventsManager, accessList, accessKey,
 			haveAccess = null, rolesNames,
@@ -750,7 +750,7 @@ class Memory extends Adapter
 	/**
 	 * Check whether a role is allowed to access an action from a resource
 	 */
-	protected function _isAllowed(string roleName, string resourceName, string access) -> string | boolean
+	protected function _isAllowed(string roleName, string resourceName, string access) -> string | bool
     {
         var accessList, accessKey,checkRoleToInherit, checkRoleToInherits, usedRoleToInherits, usedRoleToInherit;
 

phalcon/acl/adapterinterface.zep

@@ -52,30 +52,30 @@ interface AdapterInterface
 	/**
 	 * Adds a role to the ACL list. Second parameter lets to inherit access data from other existing role
 	 */
-	public function addRole(role, accessInherits = null) -> boolean;
+	public function addRole(role, accessInherits = null) -> bool;
 
 	/**
 	 * Do a role inherit from another existing role
 	 */
-	public function addInherit(string roleName, roleToInherit) -> boolean;
+	public function addInherit(string roleName, roleToInherit) -> bool;
 
 	/**
 	 * Check whether role exist in the roles list
 	 */
-	public function isRole(string roleName) -> boolean;
+	public function isRole(string roleName) -> bool;
 
 	/**
 	 * Check whether resource exist in the resources list
 	 */
-	public function isResource(string resourceName) -> boolean;
+	public function isResource(string resourceName) -> bool;
 
 	/**
 	 * Adds a resource to the ACL list
 	 *
 	 * Access names can be a particular action, by example
 	 * search, update, delete, etc or a list of them
 	 */
-	public function addResource(resourceObject, accessList) -> boolean;
+	public function addResource(resourceObject, accessList) -> bool;
 
 	/**
 	 * Adds access to resources
@@ -100,7 +100,7 @@ interface AdapterInterface
 	/**
 	 * Check whether a role is allowed to access an action from a resource
 	 */
-	public function isAllowed(roleName, resourceName, access, array parameters = null) -> boolean;
+	public function isAllowed(roleName, resourceName, string access, array parameters = null) -> bool;
 
 	/**
 	 * Returns the role which the list is checking if it's allowed to certain resource/access

phalcon/annotations/adapter/apcu.zep

@@ -62,7 +62,7 @@ class Apcu extends Adapter
 	/**
 	 * Reads parsed annotations from APCu
 	 */
-	public function read(string! key) -> <Reflection> | boolean
+	public function read(string! key) -> <Reflection> | bool
 	{
 		return apcu_fetch(strtolower("_PHAN" . this->_prefix . key));
 	}