refactor!: Drop PHP 8.1 support (#177)

Closes: #144

Author: LastDragon-ru

README.md

@@ -12,7 +12,7 @@ The set provides best practices to make development more fun and classes/service
 |--------------|---------------------|------------------|
 |  PHP  | `^8.3` |   `HEAD ⋯ 5.0.0`   |
 |  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
-|  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
+|  | `^8.1` |   `6.4.1 ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
 |  | `>=8.0.0` |   `0.11.0 ⋯ 0.4.0`   |

composer.json

@@ -32,7 +32,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2|^8.3",
+    "php": "^8.2|^8.3",
     "ext-bcmath": "*",
     "ext-dom": "*",
     "ext-filter": "*",
@@ -43,7 +43,7 @@
     "ext-xmlreader": "*",
     "composer/semver": "^3.2",
     "doctrine/sql-formatter": "^1.1",
-    "guzzlehttp/psr7": "^1.9.1|^2.4.5",
+    "guzzlehttp/psr7": "^2.4.5",
     "http-interop/http-factory-guzzle": "^1.0.0",
     "illuminate/collections": "^10.34.0|^11.0.0",
     "illuminate/conditionable": "^10.34.0|^11.0.0",
@@ -62,7 +62,7 @@
     "illuminate/translation": "^10.34.0|^11.0.0",
     "illuminate/validation": "^10.34.0|^11.0.0",
     "league/commonmark": "^2.4",
-    "mockery/mockery": "^1.6.2",
+    "mockery/mockery": "^1.6.5",
     "nikic/php-parser": "^4.18|^5.0",
     "nuwave/lighthouse": "^6.5.0",
     "opis/json-schema": "^2.3.0",

docs/Shared/Upgrade/FromV6.md

@@ -1 +1,3 @@
+* [ ] PHP 8.1 is not supported anymore. Migrate to the newer version.
+
 * [ ] Direct usages of `Container::getInstances()` were replaced by explicit constructor parameters. You may need to update your code accordingly (#151).

metadata.json

@@ -10,8 +10,7 @@
             ],
             "php": [
                 "^8.3",
-                "^8.2",
-                "^8.1"
+                "^8.2"
             ]
         },
         "6.4.1": {

packages/core/README.md

@@ -12,7 +12,7 @@ This package contains useful utilities and classes.
 |--------------|---------------------|------------------|
 |  PHP  | `^8.3` |   `HEAD ⋯ 5.0.0`   |
 |  | `^8.2` |   `HEAD ⋯ 2.0.0`   |
-|  | `^8.1` |   `HEAD ⋯ 2.0.0`   |
+|  | `^8.1` |   `6.4.1 ⋯ 2.0.0`   |
 |  | `^8.0` |   `4.6.0 ⋯ 2.0.0`   |
 |  | `^8.0.0` |   `1.1.2 ⋯ 0.12.0`   |
 |  | `>=8.0.0` |   `0.11.0 ⋯ 0.4.0`   |

packages/core/UPGRADE.md

@@ -33,6 +33,8 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases)
 [//]: # (start: 470dd21d18d5886f1873b1247130ac8173ed99258e41418c6bd32162325d628b)
 [//]: # (warning: Generated automatically. Do not edit.)
 
+* [ ] PHP 8.1 is not supported anymore. Migrate to the newer version.
+
 * [ ] Direct usages of `Container::getInstances()` were replaced by explicit constructor parameters. You may need to update your code accordingly (#151).
 
 [//]: # (end: 470dd21d18d5886f1873b1247130ac8173ed99258e41418c6bd32162325d628b)

packages/core/composer.json

@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2|^8.3",
+    "php": "^8.2|^8.3",
     "illuminate/console": "^10.34.0|^11.0.0",
     "illuminate/container": "^10.34.0|^11.0.0",
     "illuminate/contracts": "^10.34.0|^11.0.0",
@@ -30,7 +30,7 @@
   "require-dev": {
     "phpunit/phpunit": "^10.1.0|^11.0.0",
     "lastdragon-ru/lara-asp-testing": "self.version",
-    "mockery/mockery": "^1.6.2",
+    "mockery/mockery": "^1.6.5",
     "orchestra/testbench": "^8.0.0|^9.0.0"
   },
   "autoload": {

packages/core/metadata.json

@@ -10,8 +10,7 @@
             ],
             "php": [
                 "^8.3",
-                "^8.2",
-                "^8.1"
+                "^8.2"
             ]
         },
         "6.4.1": {

packages/core/src/Helpers/Translator.php

@@ -29,7 +29,7 @@ abstract protected function getName(): string;
      * @param list<string>|string  $key
      * @param array<string, mixed> $replace
      */
-    public function get(array|string $key, array $replace = [], string $locale = null): string {
+    public function get(array|string $key, array $replace = [], ?string $locale = null): string {
         return $this->translate($key, function (string $key) use ($replace, $locale): string {
             return Cast::toString($this->translator->get($this->key($key), $replace, $locale));
         });
@@ -44,7 +44,7 @@ public function choice(
         array|string $key,
         Countable|array|int $number,
         array $replace = [],
-        string $locale = null,
+        ?string $locale = null,
     ): string {
         return $this->translate($key, function (string $key) use ($number, $replace, $locale): string {
             return $this->translator->choice($this->key($key), $number, $replace, $locale);

packages/dev/README.md

@@ -12,7 +12,7 @@ Various internal tools and helpers to develop the package itself.
 |--------------|---------------------|------------------|
 |  PHP  | `^8.3` |   `HEAD ⋯ 6.2.0`   |
 |  | `^8.2` |   `HEAD ⋯ 6.2.0`   |
-|  | `^8.1` |   `HEAD ⋯ 6.2.0`   |
+|  | `^8.1` |   `6.4.1 ⋯ 6.2.0`   |
 |  PHPStan  | `^1.10` |   `HEAD ⋯ 6.2.0`   |
 
 [//]: # (end: 0f999169cbabc32d4f47c79c31d74f8b4066c685962719bae5df3c63a08ea382)

packages/dev/UPGRADE.md

@@ -26,3 +26,15 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases)
 |:--:|:--------------------------------------------------------------------------------------------------------------------|
 
 [//]: # (end: 8e89e65b3785cb5b41f28a4f3c5b7e0db0110d8047852d71cd99b2cdffd8f57c)
+
+# Upgrade from v6
+
+[include:file]: ../../docs/Shared/Upgrade/FromV6.md
+[//]: # (start: 470dd21d18d5886f1873b1247130ac8173ed99258e41418c6bd32162325d628b)
+[//]: # (warning: Generated automatically. Do not edit.)
+
+* [ ] PHP 8.1 is not supported anymore. Migrate to the newer version.
+
+* [ ] Direct usages of `Container::getInstances()` were replaced by explicit constructor parameters. You may need to update your code accordingly (#151).
+
+[//]: # (end: 470dd21d18d5886f1873b1247130ac8173ed99258e41418c6bd32162325d628b)

packages/dev/composer.json

@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2|^8.3",
+    "php": "^8.2|^8.3",
     "illuminate/contracts": "^10.34.0|^11.0.0",
     "illuminate/support": "^10.34.0|^11.0.0",
     "larastan/larastan": "^2.8.1",

packages/dev/metadata.json

@@ -9,8 +9,7 @@
         "HEAD": {
             "php": [
                 "^8.3",
-                "^8.2",
-                "^8.1"
+                "^8.2"
             ],
             "phpstan/phpstan": [
                 "^1.10"

packages/dev/src/App/Example.php

@@ -91,11 +91,11 @@ public function __invoke(File $file): ?string {
         return $result;
     }
 
-    public static function dump(mixed $value, string $expression = null): void {
+    public static function dump(mixed $value, ?string $expression = null): void {
         self::getDumper()->dump($value, $expression ?? self::getExpression(__FUNCTION__));
     }
 
-    public static function raw(Stringable|string $value, string $type, string $expression = null): void {
+    public static function raw(Stringable|string $value, string $type, ?string $expression = null): void {
         self::getDumper()->raw($value, $expression ?? self::getExpression(__FUNCTION__), $type);
     }
 

packages/documentator/README.md

@@ -12,7 +12,7 @@ This package provides various utilities for documentation generation such as Mar
 |--------------|---------------------|------------------|
 |  PHP  | `^8.3` |   `HEAD ⋯ 5.0.0`   |
 |  | `^8.2` |   `HEAD ⋯ 5.0.0-beta.1`   |
-|  | `^8.1` |   `HEAD ⋯ 5.0.0-beta.1`   |
+|  | `^8.1` |   `6.4.1 ⋯ 5.0.0-beta.1`   |
 |  Laravel  | `^11.0.0` |   `HEAD ⋯ 6.2.0`   |
 |  | `^10.34.0` |   `HEAD ⋯ 6.2.0`   |
 |  | `^10.0.0` |   `6.1.0 ⋯ 5.0.0-beta.1`   |

packages/documentator/UPGRADE.md

@@ -33,6 +33,8 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases)
 [//]: # (start: 470dd21d18d5886f1873b1247130ac8173ed99258e41418c6bd32162325d628b)
 [//]: # (warning: Generated automatically. Do not edit.)
 
+* [ ] PHP 8.1 is not supported anymore. Migrate to the newer version.
+
 * [ ] Direct usages of `Container::getInstances()` were replaced by explicit constructor parameters. You may need to update your code accordingly (#151).
 
 [//]: # (end: 470dd21d18d5886f1873b1247130ac8173ed99258e41418c6bd32162325d628b)

packages/documentator/composer.json

@@ -18,7 +18,7 @@
     "forum": "https://github.com/LastDragon-ru/lara-asp/discussions"
   },
   "require": {
-    "php": "^8.1|^8.2|^8.3",
+    "php": "^8.2|^8.3",
     "ext-mbstring": "*",
     "composer/semver": "^3.2",
     "illuminate/contracts": "^10.34.0|^11.0.0",
@@ -41,7 +41,7 @@
   },
   "require-dev": {
     "lastdragon-ru/lara-asp-testing": "self.version",
-    "mockery/mockery": "^1.6.2",
+    "mockery/mockery": "^1.6.5",
     "orchestra/testbench": "^8.0.0|^9.0.0",
     "phpunit/phpunit": "^10.1.0|^11.0.0",
     "webonyx/graphql-php": "^15.4.0"

packages/documentator/metadata.json

@@ -10,8 +10,7 @@
             ],
             "php": [
                 "^8.3",
-                "^8.2",
-                "^8.1"
+                "^8.2"
             ]
         },
         "6.4.1": {

packages/documentator/src/PackageException.php

@@ -6,7 +6,7 @@
 use Throwable;
 
 abstract class PackageException extends Exception {
-    public function __construct(string $message, Throwable $previous = null) {
+    public function __construct(string $message, ?Throwable $previous = null) {
         parent::__construct($message, 0, $previous);
     }
 }

packages/documentator/src/Processor/Exceptions/CircularDependency.php

@@ -19,7 +19,7 @@ public function __construct(
         protected readonly File $target,
         protected readonly File $dependency,
         protected readonly array $stack,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             sprintf(

packages/documentator/src/Processor/Exceptions/DependencyNotFound.php

@@ -18,7 +18,7 @@ public function __construct(
          * @var Dependency<*>
          */
         protected readonly Dependency $dependency,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             sprintf(

packages/documentator/src/Processor/Exceptions/FileSaveFailed.php

@@ -12,7 +12,7 @@ class FileSaveFailed extends ProcessorError {
     public function __construct(
         protected Directory $root,
         protected readonly File $target,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             sprintf(

packages/documentator/src/Processor/Exceptions/FileTaskFailed.php

@@ -14,7 +14,7 @@ public function __construct(
         protected Directory $root,
         protected readonly File $target,
         protected readonly Task $task,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             sprintf(

packages/documentator/src/Processor/Exceptions/ProcessingFailed.php

@@ -10,7 +10,7 @@
 class ProcessingFailed extends ProcessorError {
     public function __construct(
         protected Directory $root,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             sprintf(

packages/documentator/src/Processor/Tasks/Preprocess/Exceptions/DependencyIsMissing.php

@@ -14,7 +14,7 @@ class DependencyIsMissing extends InstructionFailed {
     public function __construct(
         Context $context,
         private readonly string $class,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Exceptions/InstructionFailed.php

@@ -9,7 +9,7 @@ abstract class InstructionFailed extends PreprocessError {
     public function __construct(
         private readonly Context $context,
         string $message,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $previous);
     }

packages/documentator/src/Processor/Tasks/Preprocess/Exceptions/PreprocessFailed.php

@@ -6,7 +6,7 @@
 
 class PreprocessFailed extends PreprocessError {
     public function __construct(
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             'Preprocessing failed.',

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/Exceptions/ArtisanCommandError.php

@@ -11,7 +11,7 @@
 class ArtisanCommandError extends InstructionFailed {
     public function __construct(
         Context $context,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeArtisan/Exceptions/ArtisanCommandFailed.php

@@ -12,7 +12,7 @@ class ArtisanCommandFailed extends InstructionFailed {
     public function __construct(
         Context $context,
         private readonly int $result,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeDocBlock/Exceptions/TargetIsNotValidPhpFile.php

@@ -9,7 +9,7 @@
 use function sprintf;
 
 class TargetIsNotValidPhpFile extends InstructionFailed {
-    public function __construct(Context $context, Throwable $previous = null) {
+    public function __construct(Context $context, ?Throwable $previous = null) {
         parent::__construct(
             $context,
             sprintf(

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeDocumentList/Exceptions/DocumentTitleIsMissing.php

@@ -13,7 +13,7 @@ class DocumentTitleIsMissing extends InstructionFailed {
     public function __construct(
         Context $context,
         private readonly File $document,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeExample/Exceptions/ExampleFailed.php

@@ -13,7 +13,7 @@ class ExampleFailed extends InstructionFailed {
     public function __construct(
         Context $context,
         private readonly File $example,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeExec/Exceptions/TargetExecFailed.php

@@ -9,7 +9,7 @@
 use function sprintf;
 
 class TargetExecFailed extends InstructionFailed {
-    public function __construct(Context $context, Throwable $previous = null) {
+    public function __construct(Context $context, ?Throwable $previous = null) {
         parent::__construct(
             $context,
             sprintf(

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeGraphqlDirective/Exceptions/TargetIsNotDirective.php

@@ -9,7 +9,7 @@
 use function sprintf;
 
 class TargetIsNotDirective extends InstructionFailed {
-    public function __construct(Context $context, Throwable $previous = null) {
+    public function __construct(Context $context, ?Throwable $previous = null) {
         parent::__construct(
             $context,
             sprintf(

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludePackageList/Exceptions/PackageComposerJsonIsMissing.php

@@ -13,7 +13,7 @@ class PackageComposerJsonIsMissing extends InstructionFailed {
     public function __construct(
         Context $context,
         private readonly Directory $package,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludePackageList/Exceptions/PackageReadmeIsEmpty.php

@@ -15,7 +15,7 @@ public function __construct(
         Context $context,
         private readonly Directory $package,
         private readonly File $readme,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludePackageList/Exceptions/PackageReadmeTitleIsMissing.php

@@ -15,7 +15,7 @@ public function __construct(
         Context $context,
         private readonly Directory $package,
         private readonly File $readme,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             $context,

packages/documentator/src/Processor/Tasks/Preprocess/Instructions/IncludeTemplate/Exceptions/TemplateDataMissed.php

@@ -9,7 +9,7 @@
 use function sprintf;
 
 class TemplateDataMissed extends InstructionFailed {
-    public function __construct(Context $context, Throwable $previous = null) {
+    public function __construct(Context $context, ?Throwable $previous = null) {
         parent::__construct(
             $context,
             sprintf(