Merge pull request #470 from bluzphp/develop

Move `Collection` to independent component
Prepare for new version of PHPUnit
Updated codestyle

Author: Anton

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
   - master
@@ -31,7 +30,7 @@ script:
   - php vendor/bin/phpcs ./src --standard=PSR1,PSR2 --encoding=utf-8
   # Complexity of code
   - php vendor/bin/phploc ./src
-  # Run CodeCeption tests
+  # Run Codeception tests
   - php vendor/bin/codecept run --coverage --coverage-xml
 after_success:
   # Upload coverage report

composer.json

@@ -8,6 +8,7 @@
         "ext-pdo_mysql": "*",
         "ext-json": "*",
         "ext-ctype": "*",
+        "bluzphp/collection": "~1.0",
         "cache/cache": "~1.0",
         "psr/log": "~1.0",
         "zendframework/zend-diactoros": "~2.1.1",

src/Application/Application.php

@@ -11,10 +11,9 @@
 namespace Bluz\Application;
 
 use Bluz\Application\Exception\ApplicationException;
+use Bluz\Config\ConfigException;
 use Bluz\Config\ConfigLoader;
 use Bluz\Http\Exception\ForbiddenException;
-use Bluz\Http\Exception\NotAcceptableException;
-use Bluz\Http\Exception\NotAllowedException;
 use Bluz\Http\Exception\RedirectException;
 use Bluz\Common;
 use Bluz\Common\Exception\CommonException;
@@ -32,6 +31,10 @@
 use Bluz\Proxy\Translator;
 use Bluz\Request\RequestFactory;
 use Bluz\Response\Response as ResponseInstance;
+use Exception;
+use InvalidArgumentException;
+use ReflectionClass;
+use ReflectionException;
 use Zend\Diactoros\ServerRequest;
 
 /**
@@ -42,7 +45,7 @@
  * @author   Anton Shevchuk
  * @created  06.07.11 16:25
  *
- * @method Controller error(\Exception $exception)
+ * @method Controller error(Exception $exception)
  * @method mixed forbidden(ForbiddenException $exception)
  * @method null redirect(RedirectException $url)
  */
@@ -85,17 +88,17 @@ public function getEnvironment(): string
      * Get path to Application
      *
      * @return string
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function getPath(): string
     {
         if (!$this->path) {
-            if (\defined('PATH_APPLICATION')) {
+            if (defined('PATH_APPLICATION')) {
                 $this->path = PATH_APPLICATION;
             } else {
-                $reflection = new \ReflectionClass($this);
+                $reflection = new ReflectionClass($this);
                 // 3 level up
-                $this->path = \dirname($reflection->getFileName(), 3);
+                $this->path = dirname($reflection->getFileName(), 3);
             }
         }
         return $this->path;
@@ -120,7 +123,7 @@ public function isDebug(): bool
      */
     public function useLayout($flag = null): bool
     {
-        if (\is_bool($flag)) {
+        if (is_bool($flag)) {
             $this->layoutFlag = $flag;
         }
 
@@ -166,7 +169,7 @@ public function init($environment = 'production'): void
 
             // init Router
             $this->initRouter();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             throw new ApplicationException("Application can't be loaded: " . $e->getMessage());
         }
     }
@@ -175,8 +178,8 @@ public function init($environment = 'production'): void
      * Initial Request instance
      *
      * @return void
-     * @throws \Bluz\Config\ConfigException
-     * @throws \ReflectionException
+     * @throws ConfigException
+     * @throws ReflectionException
      */
     protected function initConfig(): void
     {
@@ -208,7 +211,7 @@ protected function initConfig(): void
      * Initial Request instance
      *
      * @return void
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function initRequest(): void
     {
@@ -232,7 +235,7 @@ protected function initResponse(): void
     /**
      * Get Response instance
      *
-     * @return \Bluz\Response\Response
+     * @return ResponseInstance
      */
     public function getResponse(): ResponseInstance
     {
@@ -242,7 +245,7 @@ public function getResponse(): ResponseInstance
     /**
      * Get Request instance
      *
-     * @return \Zend\Diactoros\ServerRequest
+     * @return ServerRequest
      */
     public function getRequest(): ServerRequest
     {
@@ -354,7 +357,7 @@ protected function doProcess(): void
         } catch (RedirectException $e) {
             // should return `null` for disable output and setup redirect headers
             $result = $this->redirect($e);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // dispatch default error controller
             $result = $this->error($e);
         }
@@ -386,17 +389,15 @@ protected function postProcess(): void
      * Call dispatch from any \Bluz\Package
      *     Application::getInstance()->dispatch($module, $controller, array $params);
      *
-     * @param  string $module
-     * @param  string $controller
-     * @param  array  $params
+     * @param string $module
+     * @param string $controller
+     * @param array  $params
      *
      * @return Controller
-     * @throws ComponentException
      * @throws CommonException
+     * @throws ComponentException
      * @throws ControllerException
-     * @throws ForbiddenException
-     * @throws NotAcceptableException
-     * @throws NotAllowedException
+     * @throws ReflectionException
      */
     public function dispatch($module, $controller, array $params = []): Controller
     {
@@ -436,11 +437,12 @@ protected function preDispatch($controller): void
     /**
      * Do dispatch
      *
-     * @param  Controller $controller
+     * @param Controller $controller
      *
      * @return void
      * @throws ComponentException
      * @throws ControllerException
+     * @throws ReflectionException
      */
     protected function doDispatch($controller): void
     {
@@ -461,7 +463,7 @@ protected function postDispatch($controller): void
     }
 
     /**
-     * Render, is send Response
+     * Render send Response
      *
      * @return void
      */
@@ -477,6 +479,6 @@ public function render(): void
      */
     public function end(): void
     {
-        // nothing
+        // nothing by default
     }
 }

src/Application/Helper/Redirect.php

@@ -35,10 +35,10 @@ function ($exception) {
 
         if (Request::isXmlHttpRequest()) {
             Response::setStatusCode(StatusCode::NO_CONTENT);
-            Response::setHeader('Bluz-Redirect', (string) $exception->getUrl());
+            Response::setHeader('Bluz-Redirect', $exception->getUrl());
         } else {
             Response::setStatusCode(StatusCode::FOUND);
-            Response::setHeader('Location', (string) $exception->getUrl());
+            Response::setHeader('Location', $exception->getUrl());
         }
 
         return null;

src/Auth/AbstractIdentity.php

@@ -43,6 +43,6 @@ public function hasPrivilege($module, $privilege): bool
     {
         $privileges = $this->getPrivileges();
 
-        return \in_array("$module:$privilege", $privileges, true);
+        return in_array("$module:$privilege", $privileges, true);
     }
 }

src/Auth/Model/AbstractTable.php

@@ -10,8 +10,11 @@
 
 namespace Bluz\Auth\Model;
 
+use Bluz\Db\Exception\DbException;
+use Bluz\Db\Exception\InvalidPrimaryKeyException;
 use Bluz\Db\RowInterface;
 use Bluz\Db\Table;
+use InvalidArgumentException;
 
 /**
  * Abstract class for Auth\Table
@@ -58,9 +61,9 @@ abstract class AbstractTable extends Table
      * @param  string $foreignKey
      *
      * @return RowInterface
-     * @throws \InvalidArgumentException
-     * @throws \Bluz\Db\Exception\DbException
-     * @throws \Bluz\Db\Exception\InvalidPrimaryKeyException
+     * @throws InvalidArgumentException
+     * @throws DbException
+     * @throws InvalidPrimaryKeyException
      */
     public static function getAuthRow($provider, $foreignKey): ?RowInterface
     {

src/Common/Collection.php

@@ -10,6 +10,8 @@
 
 namespace Bluz\Common\Container;
 
+use InvalidArgumentException;
+
 /**
  * Container implements ArrayAccess
  *
@@ -30,12 +32,12 @@ trait ArrayAccess
      * @param  mixed $offset
      * @param  mixed $value
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function offsetSet($offset, $value): void
     {
         if (null === $offset) {
-            throw new \InvalidArgumentException('Class `Common\Container\ArrayAccess` support only associative arrays');
+            throw new InvalidArgumentException('Class `Common\Container\ArrayAccess` support only associative arrays');
         }
         $this->doSetContainer($offset, $value);
     }