Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7f35e9b
Bump dependencies
samsonasik Dec 28, 2024
1a7dd7f
allow ArrayLookup 2.0
samsonasik Dec 28, 2024
84fb3b4
regenerate baseline
samsonasik Dec 28, 2024
74732cc
re-run rector
samsonasik Dec 28, 2024
935371f
cs fix
samsonasik Dec 28, 2024
6daa3cd
add php 8.3 and 8.4 support
samsonasik Dec 28, 2024
62fc0a1
fix php 8.4
samsonasik Dec 28, 2024
2eaa9f5
php 8.4 compatible
samsonasik Dec 28, 2024
2f377b3
php 8.4 compatible
samsonasik Dec 28, 2024
1134838
cs fix
samsonasik Dec 28, 2024
86cae6e
cs fix
samsonasik Dec 28, 2024
df6806a
run rector
samsonasik Dec 28, 2024
d4ec76e
use compat class
samsonasik Dec 28, 2024
ffd5faf
regenerate baseline
samsonasik Dec 28, 2024
6ac4906
fix test
samsonasik Dec 28, 2024
714999a
remove auto create logger via LoggerAbstractServiceFactory, as use co…
samsonasik Dec 28, 2024
a34a75f
set compatible logger
samsonasik Dec 28, 2024
8cae0bd
regenerate baseline
samsonasik Dec 28, 2024
3422d15
set compatible logger
samsonasik Dec 28, 2024
21dacb9
Revert "remove auto create logger via LoggerAbstractServiceFactory, a…
samsonasik Dec 28, 2024
b31119e
fix
samsonasik Dec 28, 2024
6fde980
fix
samsonasik Dec 28, 2024
3799aff
fix
samsonasik Dec 28, 2024
d91919f
fix
samsonasik Dec 28, 2024
67555df
regenerate baseline
samsonasik Dec 28, 2024
c3369a0
regenerate baseline
samsonasik Dec 28, 2024
3e27f94
regenerate baseline
samsonasik Dec 28, 2024
aee7f1a
fix
samsonasik Dec 28, 2024
a6ec62c
regenerate baseline
samsonasik Dec 28, 2024
17723b7
fix
samsonasik Dec 28, 2024
852c2c2
fix
samsonasik Dec 28, 2024
22b228c
run rector
samsonasik Dec 28, 2024
797beb5
run rector
samsonasik Dec 28, 2024
046be3b
drop aura/di support
samsonasik Dec 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 22 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"twig",
"plates",
"symfony",
"aura",
"pimple"
],
"homepage": "https://github.com/samsonasik/ErrorHeroModule",
Expand All @@ -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": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion config/mezzio-error-hero-module.local.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 [
Expand Down
2 changes: 1 addition & 1 deletion config/module.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 8 additions & 3 deletions kahlan-config.php
Original file line number Diff line number Diff line change
@@ -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;
}
Expand All @@ -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);
});
});
Loading
Loading