Merge remote-tracking branch 'upstream/4.3.x' into 3.23.x-merge-up-in…

…to-4.0.x_4XHhBTeB # Conflicts: # .laminas-ci.json # composer.json # composer.lock # docs/book/v3/migration.md # psalm-baseline.xml # src/Config.php # src/ServiceManager.php # test/CommonServiceLocatorBehaviorsTrait.php # test/ConfigTest.php # test/Proxy/LazyServiceFactoryTest.php
laminas · Oct 28, 2024 · 649255a · 649255a
2 parents a864018 + 0bee163
commit 649255a
Show file tree

Hide file tree

Showing 145 changed files with 6,652 additions and 4,796 deletions.
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -3,8 +3,7 @@ name: docs-build
 on:
   release:
     types: [published]
-  repository_dispatch:
-    types: docs-build
+  workflow_dispatch:
 
 jobs:
   build-deploy:
@@ -13,5 +12,5 @@ jobs:
       - name: Build Docs
         uses: laminas/documentation-theme/github-actions/docs@master
         env:
-          "DOCS_DEPLOY_KEY": ${{ secrets.DOCS_DEPLOY_KEY }}
-          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
+          DEPLOY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/benchmarks/BenchAsset/AbstractFactoryFoo.php b/benchmarks/BenchAsset/AbstractFactoryFoo.php
@@ -10,7 +10,7 @@
 class AbstractFactoryFoo implements AbstractFactoryInterface
 {
     /** {@inheritDoc} */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
+    public function __invoke(ContainerInterface $container, string $requestedName, ?array $options = null): mixed
     {
         if ($requestedName === 'foo') {
             return new Foo($options);
@@ -19,7 +19,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
     }
 
     /** {@inheritDoc} */
-    public function canCreate(ContainerInterface $container, $requestedName)
+    public function canCreate(ContainerInterface $container, string $requestedName): bool
     {
         return $requestedName === 'foo';
     }

diff --git a/benchmarks/BenchAsset/FactoryFoo.php b/benchmarks/BenchAsset/FactoryFoo.php
@@ -10,7 +10,7 @@
 class FactoryFoo implements FactoryInterface
 {
     /** {@inheritDoc} */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
+    public function __invoke(ContainerInterface $container, string $requestedName, ?array $options = null): mixed
     {
         return new Foo($options);
     }

diff --git a/bin/generate-deps-for-config-factory b/bin/generate-deps-for-config-factory
diff --git a/bin/generate-factory-for-class b/bin/generate-factory-for-class
diff --git a/composer.json b/composer.json
@@ -14,74 +14,67 @@
     "homepage": "https://laminas.dev",
     "support": {
         "issues": "https://github.com/laminas/laminas-servicemanager/issues",
-        "forum": "https://discourse.laminas.dev",
         "chat": "https://laminas.dev/chat",
-        "source": "https://github.com/laminas/laminas-servicemanager",
-        "docs": "https://docs.laminas.dev/laminas-servicemanager/",
-        "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom"
+        "forum": "https://discourse.laminas.dev"
+    },
+    "config": {
+        "platform": {
+            "php": "8.1.99"
+        },
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
+        }
     },
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "brick/varexporter": "^0.3.8 || ^0.4.0 || ^0.5.0",
         "laminas/laminas-stdlib": "^3.19",
-        "psr/container": "^1.0"
+        "psr/container": "^1.1 || ^2.0"
+    },
+    "extra": {
+        "laminas": {
+            "config-provider": "Laminas\\ServiceManager\\ConfigProvider",
+            "module": "Laminas\\ServiceManager"
+        }
     },
     "require-dev": {
+        "boesing/psalm-plugin-stringf": "^1.4",
         "composer/package-versions-deprecated": "^1.11.99.5",
         "friendsofphp/proxy-manager-lts": "^1.0.18",
-        "laminas/laminas-code": "^4.14.0",
+        "laminas/laminas-cli": "^1.8",
         "laminas/laminas-coding-standard": "~2.5.0",
-        "laminas/laminas-container-config-test": "^0.8",
+        "laminas/laminas-container-config-test": "^1.0",
+        "lctrs/psalm-psr-container-plugin": "^1.9",
         "mikey179/vfsstream": "^1.6.12",
         "phpbench/phpbench": "^1.3.1",
         "phpunit/phpunit": "^10.5.36",
-        "psalm/plugin-phpunit": "^0.18.4",
+        "psalm/plugin-phpunit": "^0.19.0",
+        "symfony/console": "^6.0",
         "vimeo/psalm": "^5.26.1"
     },
-    "replace": {
-        "container-interop/container-interop": "^1.2.0"
+    "provide": {
+        "psr/container-implementation": "^1.0 || ^2.0"
     },
     "conflict": {
-        "ext-psr": "*",
         "laminas/laminas-code": "<4.10.0",
-        "zendframework/zend-code": "<3.3.1",
-        "zendframework/zend-servicemanager": "*"
-    },
-    "provide": {
-        "psr/container-implementation": "^1.0"
+        "zendframework/zend-code": "<3.3.1"
     },
     "suggest": {
-        "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services"
+        "laminas/laminas-cli": "To consume CLI commands provided by this component",
+        "friendsofphp/proxy-manager-lts": "To handle lazy initialization of services"
     },
     "autoload": {
         "psr-4": {
             "Laminas\\ServiceManager\\": "src/"
-        },
-        "files": [
-            "src/autoload.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "LaminasTest\\ServiceManager\\": "test/",
             "LaminasBench\\ServiceManager\\": "benchmarks/"
-        },
-        "files": [
-            "test/autoload.php"
-        ]
-    },
-    "bin": [
-        "bin/generate-deps-for-config-factory",
-        "bin/generate-factory-for-class"
-    ],
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "composer/package-versions-deprecated": true
-        },
-        "platform": {
-            "php": "8.1.99"
-        },
-        "sort-packages": true
+        }
     },
     "scripts": {
         "benchmark": "phpbench run --revs=2 --iterations=2 --report=aggregate",