Merge pull request #475 from bluzphp/develop

Added support PHP 8

Author: Anton

src/Common/Singleton.php

@@ -68,11 +68,4 @@ private function __construct()
     private function __clone()
     {
     }
-
-    /**
-     * Disabled by access level
-     */
-    private function __wakeup()
-    {
-    }
 }

src/Router/Router.php

@@ -408,6 +408,9 @@ protected function urlCustom(string $module, string $controller, array $params):
                 $getParams[$key] = $value;
                 continue;
             }
+            if (is_numeric($value)) {
+                $value = (string) $value;
+            }
             $url = str_replace('{$' . $key . '}', $value, $url, $replaced);
             // if not replaced, setup param as GET
             if (!$replaced) {

src/Session/Adapter/Cache.php

@@ -17,7 +17,6 @@
 /**
  * Cache session handler
  *
- * @todo    Migrate to {@link https://github.com/php-cache/session-handler PSR-6 Session handler}
  * @package Bluz\Session\Adapter
  */
 class Cache extends AbstractAdapter implements \SessionHandlerInterface

src/Session/Session.php

@@ -262,24 +262,27 @@ public function getAdapter(): string
      */
     protected function init(): bool
     {
+        if ($this->sessionHandler) {
+            return true;
+        }
+
         if ('files' === $this->adapter) {
+            $this->sessionHandler = new \SessionHandler();
             // try to apply settings
             if ($settings = $this->getOption('settings', 'files')) {
                 $this->setSavePath($settings['save_path']);
             }
-            return true;
+            return session_set_save_handler($this->sessionHandler);
         }
-        if (null === $this->sessionHandler) {
-            $adapterClass = '\\Bluz\\Session\\Adapter\\' . ucfirst($this->adapter);
-            if (!class_exists($adapterClass) || !is_subclass_of($adapterClass, SessionHandlerInterface::class)) {
-                throw new ComponentException("Class for session adapter `{$this->adapter}` not found");
-            }
-            $settings = $this->getOption('settings', $this->adapter) ?: [];
 
-            $this->adapter = new $adapterClass($settings);
-            return session_set_save_handler($this->adapter);
+        $adapterClass = '\\Bluz\\Session\\Adapter\\' . ucfirst($this->adapter);
+        if (!class_exists($adapterClass) || !is_subclass_of($adapterClass, SessionHandlerInterface::class)) {
+            throw new ComponentException("Class for session adapter `{$this->adapter}` not found");
         }
-        return true;
+        $settings = $this->getOption('settings', $this->adapter) ?: [];
+
+        $this->sessionHandler = new $adapterClass($settings);
+        return session_set_save_handler($this->sessionHandler);
     }
 
     /**

src/Validator/Rule/AbstractFilterRule.php

@@ -38,14 +38,9 @@ abstract protected function validateClean($input);
      * Setup validation rule
      *
      * @param string $additionalChars
-     *
-     * @throws \Bluz\Validator\Exception\ComponentException
      */
-    public function __construct($additionalChars = '')
+    public function __construct(string $additionalChars = '')
     {
-        if (!is_string($additionalChars)) {
-            throw new ComponentException('Invalid list of additional characters to be loaded');
-        }
         $this->additionalChars .= $additionalChars;
     }
 

src/Validator/Rule/BetweenInclusiveRule.php

@@ -30,6 +30,17 @@ class BetweenInclusiveRule extends BetweenRule
      */
     public function getDescription(): string
     {
-        return __('must be inclusive between "%1" and "%2"', $this->minValue, $this->maxValue);
+
+        $min = $this->minValue;
+        $max = $this->maxValue;
+
+        if ($min instanceof \DateTime) {
+            $min = date_format($min, 'r');
+        }
+        if ($max instanceof \DateTime) {
+            $max = date_format($max, 'r');
+        }
+
+        return __('must be inclusive between "%1s" and "%2s"', $min, $max);
     }
 }

src/Validator/Rule/BetweenRule.php

@@ -72,6 +72,16 @@ public function validate($input): bool
      */
     public function getDescription(): string
     {
-        return __('must be between "%1" and "%2"', $this->minValue, $this->maxValue);
+        $min = $this->minValue;
+        $max = $this->maxValue;
+
+        if ($min instanceof \DateTime) {
+            $min = date_format($min, 'r');
+        }
+        if ($max instanceof \DateTime) {
+            $max = date_format($max, 'r');
+        }
+
+        return __('must be between "%1s" and "%2s"', $min, $max);
     }
 }

src/Validator/Rule/CreditCardRule.php

@@ -33,7 +33,7 @@ class CreditCardRule extends AbstractRule
      */
     public function validate($input): bool
     {
-        $input = preg_replace('([ \.-])', '', $input);
+        $input = preg_replace('([ \.-])', '', (string) $input);
 
         if (!is_numeric($input)) {
             return false;

src/Validator/Rule/NegativeRule.php

@@ -32,6 +32,6 @@ class NegativeRule extends AbstractRule
      */
     public function validate($input): bool
     {
-        return $input < 0;
+        return is_numeric($input) && $input < 0;
     }
 }

src/Validator/Rule/PositiveRule.php

@@ -32,6 +32,6 @@ class PositiveRule extends AbstractRule
      */
     public function validate($input): bool
     {
-        return $input > 0;
+        return is_numeric($input) && $input > 0;
     }
 }