Merge pull request #421 from AntonShevchuk/master

Fixed code and comments style
bluzphp · Jun 30, 2017 · 6f56205 · 6f56205
2 parents 4042360 + 347a99b
commit 6f56205
Show file tree

Hide file tree

Showing 361 changed files with 2,719 additions and 1,320 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,19 +1,27 @@
 checks:
-  php: true
+  php:
+      psr2_switch_declaration: true
+      psr2_class_declaration: true
+      no_short_open_tag: true
+      deprecated_code_usage: true
+      code_rating: true
 filter:
   excluded_paths:
     - vendor/
     - tests/
 tools:
   external_code_coverage:
     timeout: 600
-  php_code_sniffer: true
-  php_mess_detector: true
+  php_analyzer: true
+  php_code_sniffer:
+    config:
+      standard: PSR2
+  php_cpd:
+      enabled: true
+      excluded_dirs: [vendor, tests]
   php_loc:
-    enabled: true
-    excluded_dirs: [vendor, tests]
+      enabled: true
+      excluded_dirs: [vendor, tests]
+  php_mess_detector: true
   php_pdepend: true
-  php_cpd:
-    enabled: true
-    excluded_dirs: [vendor, tests]
   sensiolabs_security_checker: true
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
   global:
     - secure: "QKyI/QO6H6pFE04Iz/4IcSuttMdY3o85mD2BTNV2Y2SeSPxLfuukqPrxjANrTc4GfI1v7/bZM43uMl3aRa76+HRZ83ZsXR8uv1VZUgNHYuoq7jdZb18BitM36h0LbHzTbYetJLiYg7l3mnbAezTXPXHfpNIWvZcuyZzatyF/lng="
 before_install:
+  # Prefer IPv4 over IPv6
   - sudo sh -c "echo 'precedence ::ffff:0:0/96 100' >> /etc/gai.conf"
 install:
   # Composer
@@ -24,11 +25,11 @@ before_script:
   - wget https://scrutinizer-ci.com/ocular.phar
 script:
   # Check code style
-  - php vendor/bin/phpcs --report=xml --report-file=.reports/phpcs.xml
+  #- php vendor/bin/phpcs --report=xml --report-file=.reports/phpcs.xml
   # Lines of code
-  - php vendor/bin/phploc --log-xml=.reports/phploc.xml src
+  #- php vendor/bin/phploc --log-xml=.reports/phploc.xml src
   # Mess detection
-  - php vendor/bin/phpmd ./src xml codesize,unusedcode,naming --reportfile .reports/phpmd.xml || true
+  #- php vendor/bin/phpmd ./src xml codesize,unusedcode,naming --reportfile .reports/phpmd.xml || true
   # Run CodeCeption tests
   - php vendor/bin/codecept run --coverage --coverage-xml
 after_success:

diff --git a/src/Acl/Acl.php b/src/Acl/Acl.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -32,7 +32,7 @@ class Acl
      *
      * @return bool
      */
-    public function isAllowed($module, $privilege) : bool
+    public function isAllowed($module, $privilege): bool
     {
         if ($privilege) {
             $user = Auth::getIdentity();

diff --git a/src/Acl/AclException.php b/src/Acl/AclException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Application.php b/src/Application/Application.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -107,21 +107,23 @@ public function isDebug()
      * Return/setup Layout Flag
      *
      * @param  bool|null $flag
+     *
      * @return bool
      */
     public function useLayout($flag = null)
     {
         if (is_bool($flag)) {
             $this->layoutFlag = $flag;
         }
-        
+
         return $this->layoutFlag;
     }
 
     /**
      * Initialize system packages
      *
      * @param  string $environment
+     *
      * @throws ApplicationException
      * @return void
      */
@@ -172,14 +174,14 @@ protected function initConfig()
 
         // setup configuration for current environment
         if ($debug = Config::getData('debug')) {
-            $this->debugFlag = (bool) $debug;
+            $this->debugFlag = (bool)$debug;
         }
 
         // initial php settings
         if ($ini = Config::getData('php')) {
             foreach ($ini as $key => $value) {
                 $result = ini_set($key, $value);
-                Logger::info('app:init:php:'.$key.':'.($result?:'---'));
+                Logger::info('app:init:php:' . $key . ':' . ($result ?: '---'));
             }
         }
     }
@@ -353,6 +355,7 @@ protected function postProcess()
      * @param  string $module
      * @param  string $controller
      * @param  array  $params
+     *
      * @return Controller
      * @throws ApplicationException
      */
@@ -371,6 +374,7 @@ public function dispatch($module, $controller, $params = [])
      * @param  string $module
      * @param  string $controller
      * @param  array  $params
+     *
      * @return void
      */
     protected function preDispatch($module, $controller, $params = [])
@@ -383,7 +387,8 @@ protected function preDispatch($module, $controller, $params = [])
      *
      * @param  string $module
      * @param  string $controller
-     * @param  array $params
+     * @param  array  $params
+     *
      * @return Controller
      * @throws \Bluz\Application\Exception\ForbiddenException
      * @throws \Bluz\Application\Exception\NotAllowedException
@@ -415,6 +420,7 @@ protected function doDispatch($module, $controller, $params = [])
      * @param  string $module
      * @param  string $controller
      * @param  array  $params
+     *
      * @return void
      */
     protected function postDispatch($module, $controller, $params = [])

diff --git a/src/Application/Exception/ApplicationException.php b/src/Application/Exception/ApplicationException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/BadRequestException.php b/src/Application/Exception/BadRequestException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/ForbiddenException.php b/src/Application/Exception/ForbiddenException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/NotAcceptableException.php b/src/Application/Exception/NotAcceptableException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/NotAllowedException.php b/src/Application/Exception/NotAllowedException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/NotFoundException.php b/src/Application/Exception/NotFoundException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/NotImplementedException.php b/src/Application/Exception/NotImplementedException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/RedirectException.php b/src/Application/Exception/RedirectException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Exception/UnauthorizedException.php b/src/Application/Exception/UnauthorizedException.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Application/Helper/Error.php b/src/Application/Helper/Error.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -17,7 +17,9 @@
 
 /**
  * Reload helper can be declared inside Bootstrap
+ *
  * @param \Exception $exception
+ *
  * @return Controller
  */
 return

diff --git a/src/Application/Helper/Forbidden.php b/src/Application/Helper/Forbidden.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -16,7 +16,9 @@
 
 /**
  * Forbidden helper can be declared inside Bootstrap
+ *
  * @param ForbiddenException $exception
+ *
  * @return Controller
  */
 return

diff --git a/src/Application/Helper/Redirect.php b/src/Application/Helper/Redirect.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -17,7 +17,9 @@
 
 /**
  * Redirect helper can be declared inside Bootstrap
+ *
  * @param string $url
+ *
  * @return null
  */
 return
@@ -26,7 +28,7 @@ function ($url) {
          * @var Application $this
          */
         $this->useLayout(false);
-        
+
         Response::removeHeaders();
         Response::clearBody();
 

diff --git a/src/Auth/AbstractRow.php b/src/Auth/AbstractRow.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);

diff --git a/src/Auth/AbstractRowEntity.php b/src/Auth/AbstractRowEntity.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -32,16 +32,17 @@ abstract public function tryLogin();
      *
      * @return array
      */
-    abstract public function getPrivileges() : array;
+    abstract public function getPrivileges(): array;
 
     /**
      * Has role a privilege
      *
      * @param  string $module
      * @param  string $privilege
+     *
      * @return bool
      */
-    public function hasPrivilege($module, $privilege) : bool
+    public function hasPrivilege($module, $privilege): bool
     {
         $privileges = $this->getPrivileges();
 

diff --git a/src/Auth/AbstractTable.php b/src/Auth/AbstractTable.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -61,6 +61,7 @@ abstract class AbstractTable extends Table
      *
      * @param  string $provider
      * @param  string $foreignKey
+     *
      * @return AbstractRow
      */
     public function getAuthRow($provider, $foreignKey)
@@ -72,6 +73,7 @@ public function getAuthRow($provider, $foreignKey)
      * Generate Secret token
      *
      * @param  integer $id
+     *
      * @return string
      */
     protected function generateSecret($id)

diff --git a/src/Auth/Auth.php b/src/Auth/Auth.php
@@ -3,7 +3,7 @@
  * Bluz Framework Component
  *
  * @copyright Bluz PHP Team
- * @link https://github.com/bluzphp/framework
+ * @link      https://github.com/bluzphp/framework
  */
 
 declare(strict_types=1);
@@ -34,6 +34,7 @@ class Auth
      * Setup identity
      *
      * @param  EntityInterface $identity
+     *
      * @return void
      */
     public function setIdentity(EntityInterface $identity)