diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index befc845..fe07299 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" steps: - name: "Checkout" @@ -43,8 +43,8 @@ jobs: strategy: matrix: php-version: - - "8.1" - "8.2" + - "8.3" dependencies: - "highest" @@ -70,7 +70,7 @@ jobs: key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer- - - name: "Remove PHP-CS-Fixer not ready for PHP 8.2 yet" + - name: "Remove PHP-CS-Fixer not ready for PHP 8.3 yet" run: "composer remove --dev --no-update slam/php-cs-fixer-extensions" - name: "Install lowest dependencies" @@ -93,7 +93,7 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" steps: - name: "Checkout" @@ -139,7 +139,7 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" steps: - name: "Checkout" @@ -176,7 +176,7 @@ jobs: strategy: matrix: php-version: - - "8.1" + - "8.2" steps: - name: "Checkout" diff --git a/Makefile b/Makefile index 2cf4540..7e2c69f 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,13 @@ all: csfix static-analysis test @echo "Done." vendor: composer.json - composer update --ignore-platform-req=php + composer update + composer bump touch vendor .PHONY: csfix csfix: vendor - php8.1 vendor/bin/php-cs-fixer fix --verbose + vendor/bin/php-cs-fixer fix --verbose .PHONY: static-analysis static-analysis: vendor diff --git a/composer.json b/composer.json index 890fd99..d586d4a 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } ], "require": { - "php": "~8.1.0 || ~8.2.0", + "php": "~8.2.0 || ~8.3.0", "phpstan/phpstan": "^1.10.43" }, "require-dev": { @@ -29,7 +29,6 @@ "laminas/laminas-hydrator": "^4.15.0", "laminas/laminas-i18n": "^2.24.1", "laminas/laminas-inputfilter": "^2.28.0", - "laminas/laminas-log": "^2.16.1", "laminas/laminas-mail": "^2.25.1", "laminas/laminas-mvc": "^3.7.0", "laminas/laminas-paginator": "^2.18.0", @@ -37,8 +36,7 @@ "phpstan/phpstan-deprecation-rules": "^1.1.4", "phpstan/phpstan-phpunit": "^1.3.15", "phpunit/phpunit": "^9.6.13", - "slam/php-cs-fixer-extensions": "^v3.9.0", - "slam/php-debug-r": "^v1.8.1" + "slam/php-cs-fixer-extensions": "^v3.10.0" }, "conflict": { "laminas/laminas-cache": "<3.9", diff --git a/src/ServiceManagerLoader.php b/src/ServiceManagerLoader.php index b581e72..c1a58dc 100644 --- a/src/ServiceManagerLoader.php +++ b/src/ServiceManagerLoader.php @@ -24,7 +24,6 @@ final class ServiceManagerLoader \Laminas\Hydrator\ConfigProvider::class, \Laminas\I18n\ConfigProvider::class, \Laminas\InputFilter\ConfigProvider::class, - \Laminas\Log\ConfigProvider::class, \Laminas\Mail\ConfigProvider::class, \Laminas\Paginator\ConfigProvider::class, \Laminas\Router\ConfigProvider::class, diff --git a/src/UnmappedAliasServiceLocatorProxy.php b/src/UnmappedAliasServiceLocatorProxy.php index d3c998d..631c356 100644 --- a/src/UnmappedAliasServiceLocatorProxy.php +++ b/src/UnmappedAliasServiceLocatorProxy.php @@ -4,10 +4,6 @@ namespace LaminasPhpStan; -use Laminas\Log\FilterPluginManager as LogFilterPluginManager; -use Laminas\Log\FormatterPluginManager as LogFormatterPluginManager; -use Laminas\Log\ProcessorPluginManager as LogProcessorPluginManager; -use Laminas\Log\WriterPluginManager as LogWriterPluginManager; use Laminas\Mvc\Controller\ControllerManager; use Laminas\ServiceManager\ServiceLocatorInterface; use Laminas\View\HelperPluginManager; @@ -21,10 +17,6 @@ final class UnmappedAliasServiceLocatorProxy implements ServiceLocatorInterface private array $knownUnmappedAliasToClassServices = [ ControllerManager::class => 'ControllerManager', HelperPluginManager::class => 'ViewHelperManager', - LogFilterPluginManager::class => 'LogFilterManager', - LogFormatterPluginManager::class => 'LogFormatterManager', - LogProcessorPluginManager::class => 'LogProcessorManager', - LogWriterPluginManager::class => 'LogWriterManager', ]; public function __construct(ServiceLocatorInterface $serviceLocator) diff --git a/tests/Type/Laminas/ServiceManagerLoaderTest.php b/tests/Type/Laminas/ServiceManagerLoaderTest.php index 5447a41..40097b6 100644 --- a/tests/Type/Laminas/ServiceManagerLoaderTest.php +++ b/tests/Type/Laminas/ServiceManagerLoaderTest.php @@ -14,10 +14,6 @@ use Laminas\Hydrator\HydratorPluginManager; use Laminas\I18n\Translator\LoaderPluginManager as I18nLoaderPluginManager; use Laminas\InputFilter\InputFilterPluginManager; -use Laminas\Log\FilterPluginManager as LogFilterPluginManager; -use Laminas\Log\FormatterPluginManager as LogFormatterPluginManager; -use Laminas\Log\ProcessorPluginManager as LogProcessorPluginManager; -use Laminas\Log\WriterPluginManager as LogWriterPluginManager; use Laminas\Mail\Protocol\SmtpPluginManager; use Laminas\Mvc\Controller\ControllerManager; use Laminas\Mvc\Controller\PluginManager as ControllerPluginManager; @@ -71,10 +67,6 @@ public function testGetSubserviceDependingOnCallOnTypeGiven(): void HydratorPluginManager::class, I18nLoaderPluginManager::class, InputFilterPluginManager::class, - LogFilterPluginManager::class, - LogFormatterPluginManager::class, - LogProcessorPluginManager::class, - LogWriterPluginManager::class, // NavigationPluginManager::class, PaginatorAdapterPluginManager::class, RoutePluginManager::class,