Add laminas-servicemanager:v4 compatibility (#65)

Slamdunk · Aug 19, 2024 · 272fd0f · 272fd0f
1 parent 421ae11
commit 272fd0f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-DOCKER_PHP_EXEC := docker compose run php
+DOCKER_PHP_EXEC := docker compose run --rm php
 PHP_BIN=php -d zend.assertions=1
 
 all: csfix static-analysis test

diff --git a/composer.json b/composer.json
@@ -19,12 +19,12 @@
     ],
     "require": {
         "php": "~8.2.0 || ~8.3.0",
-        "phpstan/phpstan": "^1.11.9"
+        "phpstan/phpstan": "^1.11.10"
     },
     "require-dev": {
         "laminas/laminas-cache": "^3.12.2",
         "laminas/laminas-cache-storage-adapter-memory": "^2.3.0",
-        "laminas/laminas-filter": "^2.36.0",
+        "laminas/laminas-filter": "^2.37.0",
         "laminas/laminas-form": "^3.20.0",
         "laminas/laminas-hydrator": "^4.15.0",
         "laminas/laminas-i18n": "^2.28.0",
@@ -39,17 +39,17 @@
         "slam/php-cs-fixer-extensions": "^3.11.1"
     },
     "conflict": {
-        "laminas/laminas-cache": "<3.9",
-        "laminas/laminas-filter": "<2.29",
-        "laminas/laminas-form": "<3.8",
-        "laminas/laminas-hydrator": "<4.10",
-        "laminas/laminas-i18n": "<2.21",
-        "laminas/laminas-inputfilter": "<2.22",
+        "laminas/laminas-cache": "<3.12",
+        "laminas/laminas-filter": "<2.37",
+        "laminas/laminas-form": "<3.20",
+        "laminas/laminas-hydrator": "<4.15",
+        "laminas/laminas-i18n": "<2.28",
+        "laminas/laminas-inputfilter": "<2.30",
         "laminas/laminas-log": "<2.16",
-        "laminas/laminas-mail": "<2.21",
-        "laminas/laminas-mvc": "<3.6",
-        "laminas/laminas-paginator": "<2.17",
-        "laminas/laminas-validator": "<2.28"
+        "laminas/laminas-mail": "<2.25",
+        "laminas/laminas-mvc": "<3.7",
+        "laminas/laminas-paginator": "<2.18",
+        "laminas/laminas-validator": "<2.64"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/UnmappedAliasServiceLocatorProxy.php b/src/UnmappedAliasServiceLocatorProxy.php
@@ -33,21 +33,18 @@ public function get($id)
         return $this->serviceLocator->get($this->knownUnmappedAliasToClassServices[$id] ?? $id);
     }
 
-    public function has($id)
+    public function has($id): bool
     {
         return $this->serviceLocator->has($id)
             || $this->serviceLocator->has($this->knownUnmappedAliasToClassServices[$id] ?? $id);
     }
 
     /**
-     * @param string            $name
-     * @param null|array<mixed> $options
-     *
-     * @return mixed|void
+     * {@inheritDoc}
      *
      * @throws ShouldNotHappenException
      */
-    public function build($name, ?array $options = null)
+    public function build($name, ?array $options = null): mixed
     {
         throw new ShouldNotHappenException(\sprintf('Why did you call %s?', __METHOD__));
     }

diff --git a/tests/LaminasIntegration/data/stdlibAbstractOptionsProperties.php b/tests/LaminasIntegration/data/stdlibAbstractOptionsProperties.php
@@ -24,7 +24,7 @@ public function mainLibrary(): void
 
     public function custom(): void
     {
-        $class                    = new class() extends AbstractOptions {
+        $class                    = new class extends AbstractOptions {
             private string $myxyz = 'foo';
 
             public function getMyxyz(string $var): string
@@ -42,7 +42,7 @@ public function getMyxyz(string $var): string
 
     public function notAbstractOptionsImplementation(): void
     {
-        $class = new class() {
+        $class = new class {
             public function getMyxyz(string $var): string
             {
                 return $var;

diff --git a/tests/LaminasIntegration/servicemanagerloader.php b/tests/LaminasIntegration/servicemanagerloader.php
@@ -16,7 +16,7 @@
 $app = Application::init([
     'modules' => [
         'Laminas\Router',
-        'LaminasPhpStan' => new class() implements ConfigProviderInterface {
+        'LaminasPhpStan' => new class implements ConfigProviderInterface {
             /** @return array<string, array<string, array<string, array<string, string>|Closure|string>>> */
             public function getConfig(): array
             {
@@ -33,10 +33,10 @@ public function getConfig(): array
                         'factories' => [
                             HeavyService::class => InvokableFactory::class,
                             'foo_proxy'         => static function (): FooService {
-                                return new class() extends FooService {};
+                                return new class extends FooService {};
                             },
                             'foo_impl'         => static function (): FooInterface {
-                                return new class() implements FooInterface {
+                                return new class implements FooInterface {
                                     public function isFoo(): bool
                                     {
                                         return true;