Merge pull request #472 from bluzphp/develop

Migrated to 7.3
Added support of PHP 7.4
Updated travis email address

.travis.sh

@@ -16,7 +16,7 @@ if [ "$TRAVIS_REPO_SLUG" == "bluzphp/framework" ] && [ "$TRAVIS_TAG" != "" ] &&
   cp -R docs/html $HOME/docs-latest
 
   cd $HOME
-  git config --global user.email "travis@travis-ci.org"
+  git config --global user.email "travis@travis-ci.com"
   git config --global user.name "travis-ci"
   git config --global push.default simple
   git clone --quiet https://${GITHUB_TOKEN}@github.com/bluzphp/bluzphp.github.io > /dev/null

.travis.yml

@@ -10,6 +10,7 @@ matrix:
     - php: 8.0
 env:
   global:
+    - XDEBUG_MODE=coverage
     - secure: "QKyI/QO6H6pFE04Iz/4IcSuttMdY3o85mD2BTNV2Y2SeSPxLfuukqPrxjANrTc4GfI1v7/bZM43uMl3aRa76+HRZ83ZsXR8uv1VZUgNHYuoq7jdZb18BitM36h0LbHzTbYetJLiYg7l3mnbAezTXPXHfpNIWvZcuyZzatyF/lng="
 before_install:
   # Prefer IPv4 over IPv6

src/Acl/Acl.php

@@ -28,12 +28,12 @@ class Acl
     /**
      * Check user access by pair module-privilege
      *
-     * @param  string $module
-     * @param  string $privilege
+     * @param string $module
+     * @param string|null $privilege
      *
      * @return bool
      */
-    public function isAllowed($module, $privilege): bool
+    public function isAllowed(string $module, ?string $privilege): bool
     {
         if ($privilege) {
             $user = Auth::getIdentity();

src/Application/Application.php

@@ -118,11 +118,11 @@ public function isDebug(): bool
     /**
      * Return/setup Layout Flag
      *
-     * @param  bool|null $flag
+     * @param bool|null $flag
      *
      * @return bool
      */
-    public function useLayout($flag = null): bool
+    public function useLayout(?bool $flag = null): bool
     {
         if (is_bool($flag)) {
             $this->layoutFlag = $flag;
@@ -134,12 +134,12 @@ public function useLayout($flag = null): bool
     /**
      * Initialize system packages
      *
-     * @param  string $environment
+     * @param string $environment
      *
-     * @throws ApplicationException
      * @return void
+     * @throws ApplicationException
      */
-    public function init($environment = 'production'): void
+    public function init(string $environment = 'production'): void
     {
         $this->environment = $environment;
 
@@ -400,7 +400,7 @@ protected function postProcess(): void
      * @throws ControllerException
      * @throws ReflectionException
      */
-    public function dispatch($module, $controller, array $params = []): Controller
+    public function dispatch(string $module, string $controller, array $params = []): Controller
     {
         $instance = new Controller($module, $controller, $params);
 
@@ -419,11 +419,11 @@ public function dispatch($module, $controller, array $params = []): Controller
     /**
      * Extension point: pre dispatch
      *
-     * @param  Controller $controller
+     * @param Controller $controller
      *
      * @return void
      */
-    protected function preDispatch($controller): void
+    protected function preDispatch(Controller $controller): void
     {
         // check HTTP method
         $controller->checkHttpMethod();
@@ -445,7 +445,7 @@ protected function preDispatch($controller): void
      * @throws ControllerException
      * @throws ReflectionException
      */
-    protected function doDispatch($controller): void
+    protected function doDispatch(Controller $controller): void
     {
         // run controller
         $controller->run();
@@ -454,11 +454,11 @@ protected function doDispatch($controller): void
     /**
      * Extension point: post dispatch
      *
-     * @param  Controller $controller
+     * @param Controller $controller
      *
      * @return void
      */
-    protected function postDispatch($controller): void
+    protected function postDispatch(Controller $controller): void
     {
         // nothing by default
     }

src/Application/Helper/Error.php

@@ -12,19 +12,28 @@
 namespace Bluz\Application\Helper;
 
 use Bluz\Application\Application;
+use Bluz\Common\Exception\CommonException;
+use Bluz\Common\Exception\ComponentException;
 use Bluz\Controller\Controller;
+use Bluz\Controller\ControllerException;
 use Bluz\Proxy\Response;
 use Bluz\Proxy\Router;
+use Exception;
+use ReflectionException;
 
 /**
  * Reload helper can be declared inside Bootstrap
  *
- * @param \Exception $exception
+ * @param Exception $exception
  *
  * @return Controller
+ * @throws CommonException
+ * @throws ComponentException
+ * @throws ControllerException
+ * @throws ReflectionException
  */
 return
-    function ($exception) {
+    function (Exception $exception) {
         /**
          * @var Application $this
          */

src/Application/Helper/Forbidden.php

@@ -23,7 +23,7 @@
  * @return Controller
  */
 return
-    function ($exception) {
+    function (ForbiddenException $exception) {
         /**
          * @var Application $this
          */

src/Application/Helper/Redirect.php

@@ -25,7 +25,7 @@
  * @return null
  */
 return
-    function ($exception) {
+    function (RedirectException $exception) {
         /**
          * @var Application $this
          */

src/Auth/Model/AbstractTable.php

@@ -58,15 +58,15 @@ abstract class AbstractTable extends Table
     /**
      * Get AuthRow
      *
-     * @param  string $provider
-     * @param  string $foreignKey
+     * @param string $provider
+     * @param string $foreignKey
      *
      * @return RowInterface
      * @throws InvalidArgumentException
      * @throws DbException
      * @throws InvalidPrimaryKeyException
      */
-    public static function getAuthRow($provider, $foreignKey): ?RowInterface
+    public static function getAuthRow(string $provider, string $foreignKey): ?RowInterface
     {
         return static::findRow(['provider' => $provider, 'foreignKey' => $foreignKey]);
     }

src/Common/Container/ArrayAccess.php

@@ -20,10 +20,10 @@
  * @author   Anton Shevchuk
  * @see      ArrayAccess
  *
- * @method   void  doSetContainer($key, $value)
- * @method   mixed doGetContainer($key)
- * @method   bool  doContainsContainer($key)
- * @method   void  doDeleteContainer($key)
+ * @method   void  doSetContainer(string $key, $value)
+ * @method   mixed doGetContainer(string $key)
+ * @method   bool  doContainsContainer(string $key)
+ * @method   void  doDeleteContainer(string $key)
  */
 trait ArrayAccess
 {

src/Common/Container/Container.php

@@ -28,24 +28,24 @@ trait Container
     /**
      * Set key/value pair
      *
-     * @param  string $key
+     * @param string $key
      * @param  mixed  $value
      *
      * @return void
      */
-    protected function doSetContainer($key, $value): void
+    protected function doSetContainer(string $key, $value): void
     {
         $this->container[$key] = $value;
     }
 
     /**
      * Get value by key
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return mixed
      */
-    protected function doGetContainer($key)
+    protected function doGetContainer(string $key)
     {
         if ($this->doContainsContainer($key)) {
             return $this->container[$key];
@@ -56,23 +56,23 @@ protected function doGetContainer($key)
     /**
      * Check contains key in container
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return bool
      */
-    protected function doContainsContainer($key): bool
+    protected function doContainsContainer(string $key): bool
     {
         return array_key_exists($key, $this->container);
     }
 
     /**
      * Delete value by key
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return void
      */
-    protected function doDeleteContainer($key): void
+    protected function doDeleteContainer(string $key): void
     {
         unset($this->container[$key]);
     }

src/Common/Container/JsonSerialize.php

@@ -17,8 +17,6 @@
  * @package  Bluz\Common
  * @author   Anton Shevchuk
  * @see      JsonSerializable
- *
- * @method   array toArray()
  */
 trait JsonSerialize
 {

src/Common/Container/MagicAccess.php

@@ -17,58 +17,58 @@
  * @package  Bluz\Common
  * @author   Anton Shevchuk
  *
- * @method   void  doSetContainer($key, $value)
- * @method   mixed doGetContainer($key)
- * @method   bool  doContainsContainer($key)
- * @method   void  doDeleteContainer($key)
+ * @method   void  doSetContainer(string $key, $value)
+ * @method   mixed doGetContainer(string $key)
+ * @method   bool  doContainsContainer(string $key)
+ * @method   void  doDeleteContainer(string $key)
  */
 trait MagicAccess
 {
     /**
      * Magic alias for set() regular method
      *
-     * @param  string $key
+     * @param string $key
      * @param  mixed  $value
      *
      * @return void
      */
-    public function __set($key, $value): void
+    public function __set(string $key, $value): void
     {
         $this->doSetContainer($key, $value);
     }
 
     /**
      * Magic alias for get() regular method
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return mixed
      */
-    public function __get($key)
+    public function __get(string $key)
     {
         return $this->doGetContainer($key);
     }
 
     /**
      * Magic alias for contains() regular method
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return bool
      */
-    public function __isset($key): bool
+    public function __isset(string $key): bool
     {
         return $this->doContainsContainer($key);
     }
 
     /**
      * Magic alias for delete() regular method
      *
-     * @param  string $key
+     * @param string $key
      *
      * @return void
      */
-    public function __unset($key): void
+    public function __unset(string $key): void
     {
         $this->doDeleteContainer($key);
     }

src/Common/Container/RegularAccess.php

@@ -17,10 +17,10 @@
  * @package  Bluz\Common
  * @author   Anton Shevchuk
  *
- * @method   void  doSetContainer($key, $value)
- * @method   mixed doGetContainer($key)
- * @method   bool  doContainsContainer($key)
- * @method   void  doDeleteContainer($key)
+ * @method   void  doSetContainer(string $key, $value)
+ * @method   mixed doGetContainer(string $key)
+ * @method   bool  doContainsContainer(string $key)
+ * @method   void  doDeleteContainer(string $key)
  */
 trait RegularAccess
 {

src/Common/Options.php

@@ -57,7 +57,7 @@ trait Options
      *
      * @return mixed
      */
-    public function getOption($key, ...$keys)
+    public function getOption(string $key, ...$keys)
     {
         $method = 'get' . Str::toCamelCase($key);
         if (method_exists($this, $method)) {
@@ -70,11 +70,11 @@ public function getOption($key, ...$keys)
      * Set option by key over setter
      *
      * @param  string $key
-     * @param  string $value
+     * @param  mixed $value
      *
      * @return void
      */
-    public function setOption($key, $value): void
+    public function setOption(string $key, $value): void
     {
         $method = 'set' . Str::toCamelCase($key);
         if (method_exists($this, $method)) {
@@ -101,7 +101,7 @@ public function getOptions(): array
      * - options must be a array
      * - options can be null
      *
-     * @param  array $options
+     * @param array|null $options
      *
      * @return void
      */

src/Common/Str.php

@@ -22,11 +22,11 @@ class Str
     /**
      * Convert string to CamelCase
      *
-     * @param  string $subject
+     * @param string $subject
      *
      * @return string
      */
-    public static function toCamelCase($subject): string
+    public static function toCamelCase(string $subject): string
     {
         $subject = str_replace(['_', '-'], ' ', strtolower($subject));
         return str_replace(' ', '', ucwords($subject));