Implemented PHP 8.2 compatibility.

letsdrink · Jun 19, 2023 · 3073dc5 · 3073dc5
1 parent bf1c22a
commit 3073dc5
Show file tree

Hide file tree

Showing 21 changed files with 396 additions and 527 deletions.
diff --git a/Dockerfile-dev b/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM php:8.0
+FROM php:8.2.7
 
 WORKDIR /var/www
 

diff --git a/composer.json b/composer.json
@@ -1,8 +1,9 @@
 {
   "config": {
     "platform": {
-      "php": "7.4.11"
-    }
+      "php": "8.2.7"
+    },
+    "allow-plugins": true
   },
   "name": "letsdrink/ouzo",
   "description": "Ouzo PHP MVC framework",
@@ -41,16 +42,16 @@
   "require": {
     "ext-json": "*",
     "ext-fileinfo": "*",
-    "symfony/console": "^5.1",
-    "symfony/event-dispatcher": "^5.1",
+    "symfony/console": "^5.4",
+    "symfony/event-dispatcher": "^5.4",
     "filp/whoops": "2.8.*",
-    "psr/log": "^1.0",
-    "ocramius/proxy-manager": "^2.13",
-    "doctrine/annotations": "^1.10"
+    "psr/log": "^1.1",
+    "friendsofphp/proxy-manager-lts": "1.0.16",
+    "doctrine/annotations": "^1.14"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
-    "php-coveralls/php-coveralls": "^2.4"
+    "phpunit/phpunit": "^9.6",
+    "php-coveralls/php-coveralls": "^2.5"
   },
   "replace": {
     "letsdrink/ouzo-goodies": "self.version",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Ouzo/Core/Csrf/CsrfProtector.php b/src/Ouzo/Core/Csrf/CsrfProtector.php
@@ -56,7 +56,7 @@ public static function getCsrfToken(): string
     private static function generateCsrfToken(): string
     {
         $length = 32;
-        $bytes = openssl_random_pseudo_bytes(($length + 1) / 2);
+        $bytes = openssl_random_pseudo_bytes(round(($length + 1) / 2));
         $hex = bin2hex($bytes);
         return substr(base64_encode($hex), 0, $length);
     }

diff --git a/src/Ouzo/Core/Db/Stats.php b/src/Ouzo/Core/Db/Stats.php
@@ -24,7 +24,7 @@ public static function trace(string $query, mixed $params, Closure $function): m
 
     public static function getTotalTime(): int
     {
-        return array_reduce(self::$queries, fn($sum, $value) => $sum + $value['time']);
+        return round(array_reduce(self::$queries, fn($sum, $value) => $sum + $value['time']));
     }
 
     public static function reset(): void

diff --git a/src/Ouzo/Core/Helper/HtmlElementRenderer.php b/src/Ouzo/Core/Helper/HtmlElementRenderer.php
@@ -7,6 +7,7 @@
 namespace Ouzo\Helper;
 
 use Ouzo\Utilities\Arrays;
+use Ouzo\Utilities\Strings;
 
 class HtmlElementRenderer
 {
@@ -166,7 +167,7 @@ private function attributesToHtml(array $attributes): string
         $attributes = $this->sort($attributes);
 
         $attrs = Arrays::mapEntries($attributes, function ($key, $value) {
-            $escaped = htmlspecialchars($value);
+            $escaped = htmlspecialchars($value ?? Strings::EMPTY_STRING);
             return "$key=\"$escaped\"";
         });
         return implode(' ', $attrs);

diff --git a/src/Ouzo/Core/Middleware/Interceptor/DefaultRequestId.php b/src/Ouzo/Core/Middleware/Interceptor/DefaultRequestId.php
@@ -23,7 +23,7 @@ private function handleRequestContext(RequestContext $requestContext, Chain $nex
         $id = uniqid();
         if (FrontController::$requestId === null) {
             FrontController::$requestId = $id;
-            $requestContext->id = $id;
+            $requestContext->setId($id);
         }
 
         return $next->proceed($requestContext);

diff --git a/src/Ouzo/Core/Model.php b/src/Ouzo/Core/Model.php
@@ -25,9 +25,8 @@
 use Ouzo\Utilities\Strings;
 use PDO;
 use ReflectionClass;
-use Serializable;
 
-class Model extends Validatable implements Serializable, JsonSerializable
+class Model extends Validatable implements JsonSerializable
 {
     private ModelDefinition $modelDefinition;
     private array $attributes;
@@ -508,17 +507,14 @@ private function getAttributesForUpdate(): array
         return array_intersect_key($attributes, array_flip($this->modifiedFields));
     }
 
-    public function serialize(): string
+    public function __serialize(): array
     {
-        return serialize($this->attributes);
+        return $this->attributes;
     }
 
-    public function unserialize($serialized): void
+    public function __unserialize(array $serialized): void
     {
-        $result = unserialize($serialized);
-        foreach ($result as $key => $value) {
-            $this->$key = $value;
-        }
+        $this->attributes = $serialized;
     }
 
     public function jsonSerialize(): string

diff --git a/src/Ouzo/Core/Request/RequestContext.php b/src/Ouzo/Core/Request/RequestContext.php
@@ -10,6 +10,8 @@
 
 class RequestContext
 {
+    private string $id;
+
     public function __construct(
         private string $controller,
         private string $action,
@@ -32,4 +34,14 @@ public function getCurrentAction(): string
     {
         return $this->action;
     }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    public function setId(string $id): void
+    {
+        $this->id = $id;
+    }
 }
diff --git a/src/Ouzo/Core/Uri.php b/src/Ouzo/Core/Uri.php
@@ -108,7 +108,7 @@ private function parsePath(string $path = null, int $limit = null): array
         if ($path != null) {
             $prefix = Config::getValue('global', 'prefix_system');
             $pathWithoutPrefix = urldecode(str_replace($prefix, '', $path));
-            return preg_split('#/|\?#', $pathWithoutPrefix, $limit, PREG_SPLIT_NO_EMPTY);
+            return preg_split('#/|\?#', $pathWithoutPrefix, $limit ?: -1, PREG_SPLIT_NO_EMPTY);
         }
         return [];
     }

diff --git a/src/Ouzo/Core/Uri/Es6GeneratorTemplates.php b/src/Ouzo/Core/Uri/Es6GeneratorTemplates.php
@@ -55,7 +55,7 @@ private function replace(string $template, array $replacements): string
     {
         $result = $template;
         foreach ($replacements as $key => $value) {
-            $result = str_replace("${key}_REPLACEMENT", $value, $result);
+            $result = str_replace("{$key}_REPLACEMENT", $value, $result);
         }
         return $result;
     }

diff --git a/src/Ouzo/Core/View/PhtmlRenderer.php b/src/Ouzo/Core/View/PhtmlRenderer.php
@@ -7,6 +7,7 @@
 namespace Ouzo\View;
 
 use Exception;
+use Ouzo\Utilities\Arrays;
 use Ouzo\Utilities\Files;
 use Ouzo\Utilities\Strings;
 
@@ -27,7 +28,6 @@ public function __construct(
 
     public function render(): string
     {
-        $this->saveAttributes();
         ob_start();
         try {
             $this->loadViewHelper();
@@ -53,11 +53,14 @@ private function loadView(): void
         require($this->viewPath);
     }
 
-    private function saveAttributes(): void
+    public function __get(string $name)
     {
-        foreach ($this->attributes as $name => $value) {
-            $this->$name = $value;
-        }
+        return Arrays::getValue($this->attributes, $name);
+    }
+
+    public function __set(string $name, $value): void
+    {
+        $this->attributes[$name] = $value;
     }
 
     public function getViewPath(): string

diff --git a/src/Ouzo/Goodies/Utilities/DynamicProxy.php b/src/Ouzo/Goodies/Utilities/DynamicProxy.php
@@ -54,9 +54,7 @@ private static function getProxyClassDefinition(string $name, string $className)
     private static function getClassMethods(ReflectionClass $reflectionClass): array
     {
         $reflectionMethods = $reflectionClass->getMethods();
-        return Arrays::filter($reflectionMethods, function (ReflectionMethod $reflectionMethod) {
-            return !$reflectionMethod->isConstructor();
-        });
+        return Arrays::filter($reflectionMethods, fn(ReflectionMethod $reflectionMethod) => !$reflectionMethod->isConstructor());
     }
 
     private static function generateMethod(ReflectionMethod $reflectionMethod): string
@@ -69,7 +67,7 @@ private static function generateMethod(ReflectionMethod $reflectionMethod): stri
         $invoke = 'call_user_func_array(array($this->methodHandler, __FUNCTION__), func_get_args());';
 
         if (is_null($returnTypeInfo)) {
-            $methodSignature = "{$modifier} function {$methodName}({$parameters})";
+            $methodSignature = "#[\ReturnTypeWillChange]\n{$modifier} function {$methodName}({$parameters})";
             $methodBody = "return {$invoke}";
         } elseif ($returnTypeInfo['type'] === 'void') {
             $methodSignature = "{$modifier} function {$methodName}({$parameters}): void";
@@ -102,7 +100,7 @@ private static function generateParameters(ReflectionMethod $reflectionMethod):
             $parameter = '';
             if ($reflectionParameter->hasType() && $reflectionParameter->getType() instanceof ReflectionNamedType) {
                 $typeName = $reflectionParameter->getType()->getName();
-                $nullable = $typeName != 'mixed' && $reflectionParameter->allowsNull() ? '?' : '';
+                $nullable = $typeName != 'mixed' && $reflectionParameter->allowsNull() ? '?' : Strings::EMPTY_STRING;
                 $parameter .= "{$nullable}{$typeName} ";
             }
             if ($reflectionParameter->isVariadic()) {
@@ -127,7 +125,6 @@ private static function getReturnTypeInfo(ReflectionMethod $reflectionMethod): ?
             $methodReturnType = $reflectionMethod->getReturnType();
 
             if ($methodReturnType instanceof ReflectionUnionType) {
-                /** @var ReflectionUnionType $methodReturnType */
                 $type = implode('|', Arrays::map($methodReturnType->getTypes(), fn($type) => $type->getName()));
                 return [
                     'type' => $type,
@@ -157,6 +154,6 @@ private static function generateRelation(string $relation, array $classes): stri
         if ($classes) {
             return $relation . ' ' . implode(', ', $classes);
         }
-        return '';
+        return Strings::EMPTY_STRING;
     }
 }
diff --git a/src/Ouzo/Goodies/Utilities/Functions.php b/src/Ouzo/Goodies/Utilities/Functions.php
@@ -50,7 +50,7 @@ public static function constant(mixed $value): Closure
 
     public static function random(int $min = 0, ?int $max = null): Closure
     {
-        return fn() => mt_rand($min, $max);
+        return fn() => mt_rand($min, $max ?: mt_getrandmax());
     }
 
     public static function throwException(Exception $exception): Closure

diff --git a/src/Ouzo/Goodies/Utilities/Iterator/FilteringIterator.php b/src/Ouzo/Goodies/Utilities/Iterator/FilteringIterator.php
@@ -26,7 +26,7 @@ public function __construct(Iterator $iterator, callable $predicate)
         $this->predicate = Closure::fromCallable($predicate);
     }
 
-    public function accept(): mixed
+    public function accept(): bool
     {
         $predicate = $this->predicate;
         return $predicate($this->current());

diff --git a/src/Ouzo/Goodies/Utilities/Strings.php b/src/Ouzo/Goodies/Utilities/Strings.php
@@ -127,7 +127,7 @@ public static function removeSuffix(?string $string, ?string $suffix): ?string
      */
     public static function startsWith(?string $string, ?string $prefix): bool
     {
-        if (is_null($prefix)) {
+        if (is_null($string) || is_null($prefix)) {
             return false;
         }
         return str_starts_with($string, $prefix);
@@ -146,7 +146,7 @@ public static function startsWith(?string $string, ?string $prefix): bool
      */
     public static function endsWith(?string $string, ?string $suffix): bool
     {
-        if (is_null($suffix)) {
+        if (is_null($string) || is_null($suffix)) {
             return false;
         }
         return str_ends_with($string, $suffix);
@@ -164,6 +164,9 @@ public static function endsWith(?string $string, ?string $suffix): bool
      */
     public static function equalsIgnoreCase(?string $string1, ?string $string2): bool
     {
+        if (is_null($string1) && is_null($string2)) {
+            return true;
+        }
         if ((is_null($string1) && !is_null($string2)) || (!is_null($string1) && is_null($string2))) {
             return false;
         }
@@ -186,6 +189,9 @@ public static function remove(?string $string, ?string $toRemove): ?string
         if (is_null($string)) {
             return null;
         }
+        if (is_null($toRemove)) {
+            return $string;
+        }
         return str_replace($toRemove, self::EMPTY_STRING, $string);
     }
 
@@ -405,6 +411,9 @@ public static function abbreviate(?string $string, ?string $maxWidth): ?string
      */
     public static function trimToNull(?string $string): ?string
     {
+        if (is_null($string)) {
+            return null;
+        }
         $string = trim($string);
         if (mb_strlen($string) == 0) {
             return null;
@@ -488,7 +497,7 @@ public static function containsIgnoreCase(?string $string, ?string $substring):
 
     public static function substringBefore(?string $string, ?string $separator): ?string
     {
-        if (is_null($separator)) {
+        if (is_null($separator) || is_null($string)) {
             return $string;
         }
         $pos = mb_strpos($string, $separator);
@@ -497,7 +506,7 @@ public static function substringBefore(?string $string, ?string $separator): ?st
 
     public static function substringAfter(?string $string, ?string $separator): ?string
     {
-        if (is_null($separator)) {
+        if (is_null($separator) || is_null($string)) {
             return $string;
         }
         $pos = mb_strpos($string, $separator);
@@ -509,7 +518,7 @@ public static function substringAfter(?string $string, ?string $separator): ?str
 
     public static function replaceNth(?string $subject, ?string $search, ?string $replace, int $nth): ?string
     {
-        if (is_null($search)) {
+        if (is_null($search) || is_null($subject)) {
             return $subject;
         }
         $found = preg_match_all('/' . $search . '/', $subject, $matches, PREG_OFFSET_CAPTURE);

diff --git a/test/src/Ouzo/Core/FrontControllerTest.php b/test/src/Ouzo/Core/FrontControllerTest.php
@@ -474,16 +474,17 @@ public function shouldAddSomeExampleFieldIntoRequestObject()
     {
         //given
         Route::get('/sample/save', SampleFrontController::class, 'save');
+        $interceptor = new SampleMiddleware();
         $middlewareRepository = new MiddlewareRepository();
-        $middlewareRepository->add(new SampleMiddleware());
+        $middlewareRepository->add($interceptor);
 
         $this->injectorConfig->bind(MiddlewareRepository::class)->toInstance($middlewareRepository);
 
         //when
         $this->get('/sample/save');
 
         //then
-        $this->assertEquals('SampleMiddleware', $this->requestContext()->forTestPurposesOnly);
+        $this->assertEquals('SampleMiddleware', $interceptor->getData());
         $this->assertRenderedContent()->isEqualTo('save');
     }
 

diff --git a/test/src/Ouzo/Core/ModelTest.php b/test/src/Ouzo/Core/ModelTest.php
@@ -930,10 +930,10 @@ public function shouldSerializeModel()
         $product = new Product(['name' => 'Sport']);
 
         // when
-        $serialized = $product->serialize();
+        $serialized = $product->__serialize();
 
         // then
-        $this->assertEquals('a:1:{s:4:"name";s:5:"Sport";}', $serialized);
+        $this->assertEquals(['name' => 'Sport'], $serialized);
     }
 
     /**
@@ -945,7 +945,7 @@ public function shouldUnserializeModel()
         $product = new Product(['name' => 'Test']);
 
         // when
-        $product->unserialize('a:1:{s:4:"name";s:5:"Sport";}');
+        $product->__unserialize(['name' => 'Sport']);
 
         // then
         $this->assertEquals('Sport', $product->name);

diff --git a/test/src/Ouzo/Core/SampleMiddleware.php b/test/src/Ouzo/Core/SampleMiddleware.php
@@ -9,9 +9,16 @@
 
 class SampleMiddleware implements Interceptor
 {
+    private string $data;
+
     public function handle(mixed $param, Chain $next): mixed
     {
-        $param->forTestPurposesOnly = 'SampleMiddleware';
+        $this->data = 'SampleMiddleware';
         return $next->proceed($param);
     }
+
+    public function getData(): string
+    {
+        return $this->data;
+    }
 }