Raise minimum PHP version to ^8.1 and refactor code

.github/workflows/bc.yml

@@ -1,6 +1,25 @@
 on:
-  - pull_request
-  - push
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
+  push:
+    branches: ['master']
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'phpunit.xml.dist'
+      - 'psalm.xml'
 
 name: backwards compatibility
 
@@ -11,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1']

.github/workflows/bechmark.yml

@@ -28,5 +28,5 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1']
 

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -24,8 +25,10 @@ name: build
 jobs:
   phpunit:
     uses: yiisoft/actions/.github/workflows/phpunit.yml@master
+    secrets:
+      codecovToken: ${{ secrets.CODECOV_TOKEN }}
     with:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']

.github/workflows/composer-require-checker.yml

@@ -11,6 +11,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -30,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.1', '8.2', '8.3']

.github/workflows/mutation.yml

@@ -9,6 +9,7 @@ on:
       - 'psalm.xml'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -26,6 +27,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.3']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/rector.yml

@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -17,7 +17,8 @@ jobs:
     secrets:
       token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.3']

.github/workflows/static.yml

@@ -10,6 +10,7 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches: ['master']
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']

.gitignore

@@ -23,12 +23,10 @@ composer.phar
 # Mac DS_Store Files
 .DS_Store
 
-# phpunit itself is not needed
-phpunit.phar
-# local phpunit config
+# PhpUnit
+/phpunit.phar
 /phpunit.xml
-# phpunit cache
-.phpunit.result.cache
+/.phpunit.cache
 
 # Static analysis
 analysis.txt

CHANGELOG.md

@@ -1,10 +1,11 @@
 # Yii Dependency Injection Change Log
 
-## 1.2.2 under development
+## 1.3.0 under development
 
 - Enh #353: Add shortcut for tag reference #333 (@xepozz)
 - Enh #356: Improve usage `NotFoundException` for cases with definitions (@vjik)
 - Enh #364: Minor refactoring to improve performance of container (@samdark)
+- Enh #375: Raise minimum PHP version to `^8.1` and refactor code (@vjik)
 
 ## 1.2.1 December 23, 2022
 

README.md

@@ -34,7 +34,7 @@ and configure classes resolving dependencies.
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.1 or higher.
 - `Multibyte String` PHP extension.
 
 ## Installation

composer.json

@@ -32,7 +32,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-mbstring": "*",
         "psr/container": "^1.1|^2.0",
         "yiisoft/definitions": "^3.0"
@@ -41,11 +41,11 @@
         "league/container": "^4.2",
         "maglnet/composer-require-checker": "^4.2",
         "phpbench/phpbench": "^1.2.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "rector/rector": "^1.2",
         "roave/infection-static-analysis-plugin": "^1.25",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.7",
+        "vimeo/psalm": "^5.26",
         "yiisoft/injector": "^1.0",
         "yiisoft/test-support": "^3.0"
     },

phpunit.xml.dist

@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         colors="true"
-         verbose="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         executionOrder="random"
          failOnRisky="true"
          failOnWarning="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          stopOnFailure="false"
-         executionOrder="random"
-         resolveDependencies="true">
+         colors="true"
+         displayDetailsOnPhpunitDeprecations="true"
+>
     <php>
         <ini name="error_reporting" value="-1"/>
     </php>
@@ -20,9 +23,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
-            <directory>./src</directory>
+            <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

psalm.xml

@@ -14,6 +14,7 @@
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
         <InvalidCatch>
             <errorLevel type="suppress">
                 <referencedClass name="Psr\Container\NotFoundExceptionInterface" />

rector.php

@@ -5,6 +5,7 @@
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -18,10 +19,13 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 
     $rectorConfig->skip([
         ClosureToArrowFunctionRector::class,
+        FirstClassCallableRector::class => [
+            __DIR__ . '/tests/Unit/Helpers/DefinitionParserTest.php',
+        ],
     ]);
 };

src/Container.php

@@ -40,7 +40,7 @@
     /**
      * @var DefinitionStorage Storage of object definitions.
      */
-    private DefinitionStorage $definitions;
+    private readonly DefinitionStorage $definitions;
 
     /**
      * @var array Used to collect IDs of objects instantiated during build
@@ -51,7 +51,7 @@
     /**
      * @var bool $validate If definitions should be validated.
      */
-    private bool $validate;
+    private readonly bool $validate;
 
     private array $instances = [];
 
@@ -207,7 +207,6 @@
      */
     private function addDefinition(string $id, mixed $definition): void
     {
-        /** @var mixed $definition */
         [$definition, $meta] = DefinitionParser::parse($definition);
         if ($this->validate) {
             $this->validateDefinition($definition, $id);
@@ -237,7 +236,6 @@
      */
     private function addDefinitions(array $config): void
     {
-        /** @var mixed $definition */
         foreach ($config as $id => $definition) {
             if ($this->validate && !is_string($id)) {
                 throw new InvalidConfigException(
@@ -284,7 +282,7 @@
 
             $this->delegates->attach($delegate);
         }
         $this->definitions->setDelegateContainer($this->delegates);
     }
 
     /**
@@ -296,10 +294,7 @@
     private function validateDefinition(mixed $definition, ?string $id = null): void
     {
         if (is_array($definition) && isset($definition[DefinitionParser::IS_PREPARED_ARRAY_DEFINITION_DATA])) {
-            /** @var mixed $class */
             $class = $definition['class'];
-
-            /** @var mixed $constructorArguments */
             $constructorArguments = $definition['__construct()'];
 
             /**
@@ -311,7 +306,7 @@
 
             $definition = array_merge(
                 $class === null ? [] : [ArrayDefinition::CLASS_NAME => $class],
                 [ArrayDefinition::CONSTRUCTOR => $constructorArguments],
                 // extract only value from parsed definition method
                 array_map(static fn (array $data): mixed => $data[2], $methodsAndProperties),
             );
@@ -331,7 +326,6 @@
      */
     private function validateMeta(array $meta): void
     {
-        /** @var mixed $value */
         foreach ($meta as $key => $value) {
             if (!in_array($key, self::ALLOWED_META, true)) {
                 throw new InvalidConfigException(
@@ -413,7 +407,6 @@
                         )
                     );
                 }
-                /** @var mixed $service */
                 foreach ($services as $service) {
                     if (!is_string($service)) {
                         throw new InvalidConfigException(
@@ -497,7 +490,7 @@
             );
         }
 
         $this->building[$id] = 1;
         try {
             if (!$this->definitions->has($id)) {
                 throw new NotFoundException($id, $this->definitions->getBuildStack());
@@ -505,7 +498,6 @@
 
             $definition = DefinitionNormalizer::normalize($this->definitions->get($id), $id);
 
-            /** @var mixed $object */
             $object = $definition->resolve($this->get(ContainerInterface::class));
         } finally {
             unset($this->building[$id]);
@@ -520,7 +512,6 @@
         $services = [];
         if (isset($this->tags[$tag])) {
             foreach ($this->tags[$tag] as $service) {
-                /** @var mixed */
                 $services[] = $this->get($service);
             }
         }
@@ -535,15 +526,13 @@
     private function addProviders(array $providers): void
     {
         $extensions = [];
-        /** @var mixed $provider */
         foreach ($providers as $provider) {
             $providerInstance = $this->buildProvider($provider);
             $extensions[] = $providerInstance->getExtensions();
             $this->addDefinitions($providerInstance->getDefinitions());
         }
 
         foreach ($extensions as $providerExtensions) {
-            /** @var mixed $extension */
             foreach ($providerExtensions as $id => $extension) {
                 if (!is_string($id)) {
                     throw new InvalidConfigException(
@@ -568,7 +557,6 @@
                     );
                 }
 
-                /** @var mixed $definition */
                 $definition = $this->definitions->get($id);
                 if (!$definition instanceof ExtensibleService) {
                     $definition = new ExtensibleService($definition, $id);

src/ExtensibleService.php

@@ -29,8 +29,8 @@ final class ExtensibleService implements DefinitionInterface
      * @param mixed $definition Definition to allow registering extensions for.
      */
     public function __construct(
-        private mixed $definition,
-        private string $id
+        private readonly mixed $definition,
+        private readonly string $id
     ) {
     }
 
@@ -54,18 +54,15 @@ public function addExtension(callable $closure): void
 
     public function resolve(ContainerInterface $container): mixed
     {
-        /** @var mixed $service */
         $service = DefinitionNormalizer::normalize($this->definition, $this->id)
             ->resolve($container);
 
         foreach ($this->extensions as $extension) {
-            /** @var mixed $result */
             $result = $extension($container->get(ContainerInterface::class), $service);
             if ($result === null) {
                 continue;
             }
 
-            /** @var mixed $service */
             $service = $result;
         }