fix

Author: fureev

.travis.yml

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## v5.0.0
+
+### Added
+
+- Add `PHP 8.4` support
+
 ## v4.28.0
 
 ### Added

CHANGELOG.md

@@ -16,35 +16,42 @@
     }
   ],
   "require": {
-    "php": "^8.1|^8.2|^8.3",
+    "php": "^8.4",
     "ext-mbstring": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^10.1.1",
-    "phpstan/phpstan": "^1.10.14",
-    "squizlabs/php_codesniffer": "^3.7.2"
+    "ergebnis/composer-normalize": "^2.45",
+    "phpstan/phpstan": "^2.0",
+    "phpunit/phpunit": "^11.5",
+    "squizlabs/php_codesniffer": "^3.11",
+    "symfony/var-dumper": "^7.2"
   },
   "autoload": {
-    "files": [
-      "src/Global/base.php"
-    ],
     "psr-4": {
       "Php\\Support\\": "src/"
-    }
+    },
+    "files": [
+      "src/Global/base.php"
+    ]
   },
   "autoload-dev": {
     "psr-4": {
       "Php\\Support\\Tests\\": "tests/"
     }
   },
+  "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    }
+  },
   "scripts": {
-    "phpcs": "@php ./vendor/bin/phpcs",
     "cs-fix": "@php ./vendor/bin/phpcbf",
-    "phpunit": "@php ./vendor/bin/phpunit --no-coverage --testdox --colors=always",
-    "phpunit-test": "@php ./vendor/bin/phpunit --no-coverage --testdox --colors=always",
     "infection": "@php ./vendor/bin/infection --coverage=./storage/coverage --threads=4",
+    "phpcs": "@php ./vendor/bin/phpcs",
+    "phpstan": "@php ./vendor/bin/phpstan analyze -c phpstan.neon --no-progress --ansi",
+    "phpunit": "@php ./vendor/bin/phpunit --no-coverage --testdox --colors=always",
     "phpunit-cover": "@php ./vendor/bin/phpunit --coverage-text",
-    "phpstan": "@php ./vendor/bin/phpstan analyze -c ./phpstan.neon.dist --no-progress --ansi",
+    "phpunit-test": "@php ./vendor/bin/phpunit --no-coverage --testdox --colors=always",
     "test": [
       "@phpstan",
       "@phpunit"

composer.json

@@ -1,9 +1,11 @@
 parameters:
-  level: 'max'
+  level: '6'
   paths:
     - src
-  checkMissingIterableValueType: false
-  checkGenericClassInNonGenericObjectType: false
+#    - tests
+  ignoreErrors:
+    -
+      identifier: trait.unused
   excludePaths:
     - 'src/Types/Point.php'
     - 'src/Types/GeoPoint.php'

phpstan.neon.dist renamed to phpstan.neon

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php"
          colors="true" processIsolation="false" executionOrder="random" resolveDependencies="true" stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache"
          backupStaticProperties="false">
   <coverage>
     <report>

phpunit.xml

@@ -30,12 +30,24 @@
  */
 final class ConditionalHandler
 {
+    /**
+     * @var array
+     * @phpstan-ignore missingType.iterableValue
+     */
     private array $params = [];
 
+    /**
+     * @param Closure(mixed ...): mixed $handler
+     * @param bool|(Closure(mixed ...): bool) $condition
+     */
     public function __construct(private Closure $handler, private bool|Closure $condition = true)
     {
     }
 
+    /**
+     * @param (Closure(mixed ...): bool)|bool $fn
+     * @return ConditionalHandler
+     */
     public function handleIf(Closure|bool $fn): self
     {
         $this->condition = $fn;
@@ -52,6 +64,9 @@ private function resolveCondition(): bool
         return $this->condition;
     }
 
+    /**
+     * @param mixed ...$params
+     */
     public function resolve(mixed ...$params): mixed
     {
         $this->params = $params;
@@ -65,14 +80,17 @@ public function resolve(mixed ...$params): mixed
 
     /**
      * @param mixed ...$params
-     *
-     * @return mixed
      */
-    public function __invoke(mixed ...$params)
+    public function __invoke(mixed ...$params): mixed
     {
         return $this->resolve(...$params);
     }
 
+    /**
+     * @param Closure(mixed ...): mixed $fn
+     * @param bool|(Closure(mixed ...): bool) $condition
+     * @return ConditionalHandler
+     */
     public static function make(Closure $fn, bool|Closure $condition = true): self
     {
         return new self($fn, $condition);

src/ConditionalHandler.php

@@ -14,7 +14,7 @@ trait WithEnhancesForStrings
         casesToString as casesToStringBase;
     }
 
-    public static function casesToString(string $delimiter = ', ', callable $decorator = null): string
+    public static function casesToString(string $delimiter = ', ', ?callable $decorator = null): string
     {
         if ($decorator === null) {
             $decorator = static fn(self $enumItem) => "{$enumItem->value}";

src/Enums/WithEnhancesForStrings.php

@@ -21,11 +21,11 @@ class Exception extends \Exception
     /**
      * Exception constructor.
      *
-     * @param null|string $message
+     * @param ?string $message
      * @param int $code
-     * @param Throwable|null $previous
+     * @param ?Throwable $previous
      */
-    public function __construct(?string $message = null, $code = 0, Throwable $previous = null)
+    public function __construct(?string $message = null, int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message ?? $this->getName(), $code, $previous);
     }

src/Exceptions/Exception.php

@@ -16,11 +16,11 @@ class InvalidArgumentException extends \InvalidArgumentException
     /**
      * Exception constructor.
      *
-     * @param null|string $message
+     * @param ?string $message
      * @param int $code
-     * @param Throwable|null $previous
+     * @param ?Throwable $previous
      */
-    public function __construct(?string $message = null, $code = 0, Throwable $previous = null)
+    public function __construct(?string $message = null, int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message ?? $this->getName(), $code, $previous);
     }

src/Exceptions/InvalidArgumentException.php

@@ -11,8 +11,14 @@ class MissingMethodException extends BadMethodCallException
 {
     use Thrower;
 
-    public function __construct(protected ?string $method = null, string $message = null)
-    {
+    public function __construct(
+        protected ?string $method = null {
+        get {
+        return $this->method;
+        }
+        },
+        ?string $message = null
+    ) {
         parent::__construct(
             $message ??
             ($this->getName() . ($this->method ? ': "' . $this->method . '"' : ''))
@@ -26,12 +32,4 @@ public function getName(): string
     {
         return 'Missing method';
     }
-
-    /**
-     * @return null|string
-     */
-    public function getMethod(): ?string
-    {
-        return $this->method;
-    }
 }