Merge pull request #71 from acelaya-forks/feature/update-deps

Feature/update deps
shlinkio · Jul 22, 2024 · e5f38d1 · e5f38d1
2 parents 1cb0589 + b896266
commit e5f38d1
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+### Added
+* Add support for `laminas/laminas-servicemanager` v4.x.
+
+### Changed
+* Update dependencies.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* *Nothing*
+
+
 ## [5.3.2] - 2024-04-12
 ### Added
 * *Nothing*

diff --git a/composer.json b/composer.json
@@ -14,21 +14,21 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "laminas/laminas-servicemanager": "^3.22",
-        "league/csv": "^9.14",
-        "shlinkio/shlink-config": "^3.0 || ^2.5",
-        "shlinkio/shlink-json": "^1.0",
-        "symfony/console": "^7.0 || ^6.4"
+        "laminas/laminas-servicemanager": "^4.2 || ^3.22",
+        "league/csv": "^9.16",
+        "shlinkio/shlink-config": "^3.1",
+        "shlinkio/shlink-json": "^1.1",
+        "symfony/console": "^7.1"
     },
     "require-dev": {
-        "guzzlehttp/guzzle": "^7.8",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^11.0",
-        "psr/http-factory": "^1.0",
+        "guzzlehttp/guzzle": "^7.9",
+        "phpstan/phpstan": "^1.11",
+        "phpstan/phpstan-phpunit": "^1.4",
+        "phpunit/phpunit": "^11.2",
+        "psr/http-factory": "^1.1",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.3.0",
-        "symfony/var-dumper": "^7.0 || ^6.4"
+        "symfony/var-dumper": "^7.1"
     },
     "suggest": {
         "psr/http-client": "If you want to be able to import URLs from Bit.ly, YOURLS, Kutt.it or another Shlink instance",

diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist
@@ -1,6 +1,3 @@
-
-version: '3'
-
 services:
   shlink_importer_php:
     user: 1000:1000

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,3 @@
-
-version: '3'
-
 services:
   shlink_importer_php:
     container_name: shlink_importer_php

diff --git a/phpstan.neon b/phpstan.neon
@@ -2,5 +2,5 @@ includes:
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
 parameters:
-	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
+	ignoreErrors:
+		- identifier: missingType.iterableValue
diff --git a/src/Params/ConsoleHelper/ConsoleHelperManager.php b/src/Params/ConsoleHelper/ConsoleHelperManager.php
@@ -5,8 +5,31 @@
 namespace Shlinkio\Shlink\Importer\Params\ConsoleHelper;
 
 use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception\InvalidServiceException;
 
+use function get_debug_type;
+use function sprintf;
+
+/**
+ * @extends AbstractPluginManager<ParamsConsoleHelperInterface>
+ * @todo Extend from AbstractSingleInstancePluginManager once servicemanager 3 is no longer supported
+ */
 class ConsoleHelperManager extends AbstractPluginManager implements ConsoleHelperManagerInterface
 {
+    /** @var class-string<ParamsConsoleHelperInterface> */
     protected $instanceOf = ParamsConsoleHelperInterface::class; // phpcs:ignore
+
+    public function validate(mixed $instance): void
+    {
+        if ($instance instanceof $this->instanceOf) {
+            return;
+        }
+
+        throw new InvalidServiceException(sprintf(
+            'Plugin manager "%s" expected an instance of type "%s", but "%s" was received',
+            static::class,
+            $this->instanceOf,
+            get_debug_type($instance),
+        ));
+    }
 }
diff --git a/src/Strategy/ImporterStrategyManager.php b/src/Strategy/ImporterStrategyManager.php
@@ -5,8 +5,31 @@
 namespace Shlinkio\Shlink\Importer\Strategy;
 
 use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception\InvalidServiceException;
 
+use function get_debug_type;
+use function sprintf;
+
+/**
+ * @extends AbstractPluginManager<ImporterStrategyInterface>
+ * @todo Extend from AbstractSingleInstancePluginManager once servicemanager 3 is no longer supported
+ */
 class ImporterStrategyManager extends AbstractPluginManager implements ImporterStrategyManagerInterface
 {
+    /** @var class-string<ImporterStrategyInterface> */
     protected $instanceOf = ImporterStrategyInterface::class; // phpcs:ignore
+
+    public function validate(mixed $instance): void
+    {
+        if ($instance instanceof $this->instanceOf) {
+            return;
+        }
+
+        throw new InvalidServiceException(sprintf(
+            'Plugin manager "%s" expected an instance of type "%s", but "%s" was received',
+            static::class,
+            $this->instanceOf,
+            get_debug_type($instance),
+        ));
+    }
 }