T13915 coding standard

.editorconfig

@@ -11,7 +11,7 @@ indent_size              = 4
 charset                  = utf-8
 trim_trailing_whitespace = true
 
-[*.{c,h,awk,w32,bat,mk,Makefile,frag,zep,lemon,re,psm1,sh}]
+[*.{c,h,awk,w32,bat,mk,Makefile,frag,lemon,re,psm1,sh}]
 indent_style = tab
 tab_width = 4
 

.travis.yml

@@ -19,7 +19,6 @@ branches:
 addons:
   apt:
     packages:
-      - beanstalkd
       - gdb
       - lcov
   postgresql: "9.4"
@@ -40,7 +39,6 @@ cache:
 
 services:
   - mysql
-  - beanstalkd
   - mongodb
   - redis-server
   - postgresql
@@ -107,8 +105,7 @@ script:
   - vendor/bin/codecept build --quiet
   - vendor/bin/codecept run --ext DotReporter tests/cli/
   - vendor/bin/codecept run --ext DotReporter tests/integration/
-  - vendor/bin/codecept run tests/unit/
-#  - vendor/bin/codecept run --ext DotReporter tests/unit/
+  - vendor/bin/codecept run --ext DotReporter tests/unit/
 
   - .ci/run-volt-tests.sh
 

CHANGELOG-4.0.md

@@ -32,6 +32,7 @@ The implementation offers PSR-7/PSR-17 compatible components in a different name
 ## Changed
 - Refactored `Phalcon\Registry` to use the `Phalcon\Collection` class [#13893](https://github.com/phalcon/cphalcon/issues/13893)
 - Refactored `Phalcon\Session\Bag` to use the `Phalcon\Collection` class [#13893](https://github.com/phalcon/cphalcon/issues/13893)
+- Refactored almost all files of the project to abide by the new coding standard for Phalcon. Certain files have been intentionally left untouched because they will be relaced later on. [#13915](https://github.com/phalcon/cphalcon/issues/13915)
 
 ## Removed
 - Removed `Phalcon\Session\BagInterface` [#13893](https://github.com/phalcon/cphalcon/issues/13893)

phalcon/acl.zep → phalcon/Acl.zep

@@ -58,7 +58,6 @@ namespace Phalcon;
  */
 abstract class Acl
 {
-	const ALLOW = 1;
-
-	const DENY = 0;
+    const ALLOW = 1;
+    const DENY = 0;
 }

phalcon/Acl/Adapter.zep

@@ -0,0 +1,93 @@
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <team@phalconphp.com>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+namespace Phalcon\Acl;
+
+use Phalcon\Events\ManagerInterface;
+use Phalcon\Events\EventsAwareInterface;
+
+/**
+ * Phalcon\Acl\Adapter
+ *
+ * Adapter for Phalcon\Acl adapters
+ */
+abstract class Adapter implements AdapterInterface, EventsAwareInterface
+{
+    /**
+     * Active access which the list is checking if some role can access it
+     *
+     * @var string
+     */
+    protected activeAccess { get };
+
+    /**
+     * Access Granted
+     * @var bool
+     */
+    protected accessGranted = false;
+
+    /**
+     * Role which the list is checking if it's allowed to certain component/access
+     *
+     * @var string
+     */
+    protected activeRole { get };
+
+    /**
+     * Component which the list is checking if some role can access it
+     *
+     * @var string
+     */
+    protected activeComponent { get };
+
+    /**
+     * Default access
+     * @var bool
+     */
+    protected defaultAccess = false;
+
+    /**
+     * Events manager
+     * @var mixed
+     */
+    protected eventsManager;
+
+    /**
+     * Returns the default ACL access level
+     */
+    public function getDefaultAction() -> int
+    {
+        return this->defaultAccess;
+    }
+
+    /**
+     * Returns the internal event manager
+     */
+    public function getEventsManager() -> <ManagerInterface>
+    {
+        return this->eventsManager;
+    }
+
+    /**
+     * Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY)
+     */
+    public function setDefaultAction(int defaultAccess)
+    {
+        let this->defaultAccess = defaultAccess;
+    }
+
+    /**
+     * Sets the events manager
+     */
+    public function setEventsManager(<ManagerInterface> eventsManager) -> void
+    {
+        let this->eventsManager = eventsManager;
+    }
+}