Merge pull request #100 from samsonasik/bump-deps

Add PHP 8.4 support
samsonasik · Dec 28, 2024 · 3d45bf1 · 3d45bf1
2 parents 38827e5 + 046be3b
commit 3d45bf1
Show file tree

Hide file tree

Showing 23 changed files with 2,015 additions and 162 deletions.
diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2

diff --git a/composer.json b/composer.json
@@ -22,7 +22,6 @@
         "twig",
         "plates",
         "symfony",
-        "aura",
         "pimple"
     ],
     "homepage": "https://github.com/samsonasik/ErrorHeroModule",
@@ -37,15 +36,15 @@
     ],
     "require": {
         "php": "^8.1",
-        "laminas/laminas-db": "^2.16.2",
-        "laminas/laminas-diactoros": "^2.22",
-        "laminas/laminas-log": "^2.16",
-        "laminas/laminas-mail": "^2.21",
-        "laminas/laminas-psr7bridge": "^1.8",
-        "laminas/laminas-uri": "^2.10",
+        "laminas/laminas-db": "^2.20.0",
+        "laminas/laminas-diactoros": "^2.26",
+        "laminas/laminas-log": "^2.17.1",
+        "laminas/laminas-mail": "^2.25.1",
+        "laminas/laminas-psr7bridge": "^1.11",
+        "laminas/laminas-uri": "^2.13",
         "psr/container": "^1.1.2 || 2.0",
-        "samsonasik/array-lookup": "^1.0",
-        "seld/jsonlint": "^1.9",
+        "samsonasik/array-lookup": "^1.8.1 || ^2.0",
+        "seld/jsonlint": "^1.11",
         "webmozart/assert": "^1.11"
     },
     "conflict": {
@@ -57,23 +56,22 @@
         "laminas/laminas-mvc-console": "*"
     },
     "require-dev": {
-        "aura/di": "^3.4 || ^4.2.1",
-        "doctrine/dbal": "^3.5.1",
-        "doctrine/doctrine-orm-module": "^4.2.1 || ^5.0",
-        "kahlan/kahlan": "^5.2.2",
-        "laminas/laminas-cli": "^1.7",
-        "laminas/laminas-coding-standard": "^2.4",
-        "laminas/laminas-form": "^2.16 || ^3.8",
-        "laminas/laminas-mvc": "^3.6",
-        "laminas/laminas-servicemanager": "^3.20",
-        "mezzio/mezzio": "^3.14",
-        "mezzio/mezzio-laminasviewrenderer": "^2.10",
-        "php-coveralls/php-coveralls": "^2.5.3",
-        "phpstan/phpstan": "^1.9.3",
-        "phpstan/phpstan-webmozart-assert": "^1.2.2",
+        "doctrine/dbal": "^3.9.3",
+        "doctrine/doctrine-orm-module": "^4.2.1 || ^5.3",
+        "kahlan/kahlan": "^5.2.8",
+        "laminas/laminas-cli": "^1.11",
+        "laminas/laminas-coding-standard": "^2.5",
+        "laminas/laminas-form": "^2.16 || ^3.21",
+        "laminas/laminas-mvc": "^3.8",
+        "laminas/laminas-servicemanager": "^3.23",
+        "mezzio/mezzio": "^3.20.1",
+        "mezzio/mezzio-laminasviewrenderer": "^2.16",
+        "php-coveralls/php-coveralls": "^2.7.0",
+        "phpstan/phpstan": "^2.0.4",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "pimple/pimple": "^3.5",
         "rector/rector": "dev-main",
-        "symfony/dependency-injection": "^5.4.16"
+        "symfony/dependency-injection": "^5.4.48"
     },
     "suggest": {
         "mezzio/mezzio-laminasviewrenderer": "^2.0 to be able to use laminas-view template engine in mezzio ^3.0",

diff --git a/config/mezzio-error-hero-module.local.php.dist b/config/mezzio-error-hero-module.local.php.dist
@@ -6,6 +6,7 @@ use App\Exception\MyException;
 use RuntimeException;
 use Error;
 use ErrorHeroModule\Command\BaseLoggingCommandInitializer;
+use ErrorHeroModule\Compat\LoggerAbstractServiceFactory;
 use ErrorHeroModule\Middleware\Mezzio;
 use ErrorHeroModule\Middleware\MezzioFactory;
 use ErrorHeroModule\ErrorHeroModule\Middleware\Routed\Preview\ErrorPreviewAction;
@@ -15,7 +16,6 @@ use ErrorHeroModule\Command\BaseLoggingCommand;
 use ErrorHeroModule\Command\Preview\ErrorPreviewConsoleCommand;
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Log;
-use Laminas\Log\LoggerAbstractServiceFactory;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 
 return [

diff --git a/config/module.config.php b/config/module.config.php
@@ -4,8 +4,8 @@
 
 use ErrorHeroModule\Command\BaseLoggingCommandInitializer;
 use ErrorHeroModule\Command\Preview\ErrorPreviewConsoleCommand;
+use ErrorHeroModule\Compat\LoggerAbstractServiceFactory;
 use ErrorHeroModule\Controller\ErrorPreviewController;
-use Laminas\Log\LoggerAbstractServiceFactory;
 use ErrorHeroModule\Listener\Mvc;
 use ErrorHeroModule\Listener\MvcFactory;
 use ErrorHeroModule\Handler\Logging;

diff --git a/kahlan-config.php b/kahlan-config.php
@@ -1,13 +1,14 @@
 <?php
 
+use Laminas\ServiceManager\AbstractPluginManager;
 use Kahlan\Filter\Filters;
 use Kahlan\Reporter\Coverage;
 use Kahlan\Reporter\Coverage\Driver\Xdebug;
 
 // autoload hack
-class_alias(Laminas\ServiceManager\AbstractPluginManager::class, Zend\ServiceManager\AbstractPluginManager::class);
+class_alias(AbstractPluginManager::class, Zend\ServiceManager\AbstractPluginManager::class);
 
-Filters::apply($this, 'coverage', function($next) {
+Filters::apply($this, 'coverage', function($next): void {
     if (! extension_loaded('xdebug')) {
         return;
     }
@@ -26,8 +27,12 @@ class_alias(Laminas\ServiceManager\AbstractPluginManager::class, Zend\ServiceMan
 
             // mezzio preview page
             'src/Middleware/Routed/Preview/ErrorPreviewAction.php',
+
+            // compatible code
+            'src/Compat/Logger.php',
+            'src/Compat/LoggerAbstractServiceFactory.php'
         ],
         'colors'    => ! $this->commandLine()->get('no-colors')
     ]);
     $reporters->add('coverage', $coverage);
-});
+});