Add support for PHP 8.1

.laminas-ci.json

@@ -32,5 +32,8 @@
                 "dependencies": "latest"
             }
         }
-    ]
+    ],
+    "ignore_php_platform_requirements": {
+        "8.1": true
+    }
 }

composer.json

@@ -25,18 +25,18 @@
         "class": "Laminas\\ComponentInstaller\\ComponentInstaller"
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "composer-plugin-api": "^1.0 || ^2.0",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
-        "composer/composer": "^1.5.2 || ^2.0",
-        "laminas/laminas-coding-standard": "~2.1.4",
+        "composer/composer": "^2.1.9",
+        "laminas/laminas-coding-standard": "2.2.1",
         "malukenho/docheader": "^0.1.6",
-        "mikey179/vfsstream": "^1.6.7",
+        "mikey179/vfsstream": "1.6.10",
         "phpunit/phpunit": "^9.3",
         "psalm/plugin-phpunit": "^0.13.0",
-        "vimeo/psalm": "^4.2",
+        "vimeo/psalm": "^4.10",
         "webmozart/assert": "^1.6"
     },
     "autoload": {

src/Collection.php

@@ -19,6 +19,9 @@
 use function iterator_to_array;
 use function sprintf;
 
+/**
+ * @use ReturnTypeWillChange
+ */
 class Collection implements
     ArrayAccess,
     Countable,
@@ -184,6 +187,7 @@ public function prepend($value)
      * @param string|int $offset
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return array_key_exists($offset, $this->items);
@@ -196,6 +200,7 @@ public function offsetExists($offset)
      * @return mixed
      * @throws OutOfRangeException
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (! $this->offsetExists($offset)) {
@@ -217,6 +222,7 @@ public function offsetGet($offset)
      * @param mixed $value
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if (null === $offset) {
@@ -233,6 +239,7 @@ public function offsetSet($offset, $value)
      * @param string|int $offset
      * @return void
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         if ($this->offsetExists($offset)) {
@@ -245,6 +252,7 @@ public function offsetUnset($offset)
      *
      * @return int
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return count($this->items);
@@ -265,6 +273,7 @@ public function isEmpty()
      *
      * @return ArrayIterator
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->items);

src/ComponentInstaller.php

@@ -117,7 +117,7 @@ class ComponentInstaller implements
      *
      * @var string
      */
-    private $projectRoot;
+    private $projectRoot = '';
 
     /** @var Closure():PackageProviderDetectionFactory */
     private $packageProviderFactory;

src/ConfigDiscovery/AbstractDiscovery.php

@@ -33,10 +33,8 @@ abstract class AbstractDiscovery implements DiscoveryInterface
      *
      * Optionally specify project directory; $configFile will be relative to
      * this value.
-     *
-     * @param string $projectDirectory
      */
-    public function __construct($projectDirectory = '')
+    public function __construct(string $projectDirectory = '')
     {
         if ('' !== $projectDirectory && is_dir($projectDirectory)) {
             $this->configFile = sprintf(

src/ConfigDiscovery/ConfigAggregator.php

@@ -23,10 +23,7 @@ class ConfigAggregator extends AbstractDiscovery
      */
     protected $expected = '';
 
-    /**
-     * @param string $projectDirectory
-     */
-    public function __construct($projectDirectory = '')
+    public function __construct(string $projectDirectory = '')
     {
         $this->expected = sprintf(
             '/new (?:%s?%s)?ConfigAggregator\(\s*(?:array\(|\[)/s',

src/ConfigDiscovery/MezzioConfig.php

@@ -23,10 +23,7 @@ class MezzioConfig extends AbstractDiscovery
      */
     protected $expected = '';
 
-    /**
-     * @param string $projectDirectory
-     */
-    public function __construct($projectDirectory = '')
+    public function __construct(string $projectDirectory = '')
     {
         $this->expected = sprintf(
             '/new (?:%s?%s)?ConfigManager\(\s*(?:array\(|\[)/s',

test/ComponentInstallerTest.php

@@ -1069,6 +1069,49 @@ public function testOnPostPackageInstallPromptsForConfigOptionsWhenDefinedAsArra
         self::assertStringContainsString("'Other\Component'", $config);
     }
 
+    public function testAddPackageToConfigWillPassProjectRootAsStringToConfigDiscovery(): void
+    {
+        /** @psalm-var InstallationManager&MockObject $installationManager */
+        $installationManager = $this->createMock(InstallationManager::class);
+
+        /** @psalm-var Composer&MockObject $composer */
+        $composer = $this->createMock(Composer::class);
+        $composer
+            ->method('getInstallationManager')
+            ->willReturn($installationManager);
+
+        /** @psalm-var IOInterface&MockObject $io */
+        $io = $this->createMock(IOInterface::class);
+        $io
+            ->expects(self::never())
+            ->method(self::anything());
+
+        $installer = new ComponentInstaller();
+        $installer->activate(
+            $composer,
+            $io
+        );
+
+        $package = $this->createMock(PackageInterface::class);
+        $package->method('getName')->willReturn('some/component');
+        $package->method('getExtra')->willReturn([
+            'laminas' => [
+                'component'       => 'Some\\Component',
+                'config-provider' => 'Some\\Component\\ConfigProvider',
+                'module'          => 'Some\\Component',
+            ],
+        ]);
+
+        $operation = $this->createMock(InstallOperation::class);
+        $operation->method('getPackage')->willReturn($package);
+
+        $event = $this->createMock(PackageEvent::class);
+        $event->method('isDevMode')->willReturn(true);
+        $event->method('getOperation')->willReturn($operation);
+
+        $installer->onPostPackageInstall($event);
+    }
+
     public function testMultipleInvocationsOfOnPostPackageInstallCanPromptMultipleTimes(): void
     {
         // Do a first pass, with an initial package