From addfe7d607fc65ebf764f8f38df2e0f1d7f3cab0 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 20 Nov 2023 16:40:29 +0100 Subject: [PATCH] Remove support for discontinued `laminas/laminas-log` package --- composer.json | 1 - src/ServiceManagerLoader.php | 1 - src/UnmappedAliasServiceLocatorProxy.php | 8 -------- tests/Type/Laminas/ServiceManagerLoaderTest.php | 8 -------- 4 files changed, 18 deletions(-) diff --git a/composer.json b/composer.json index 82bad08..d586d4a 100644 --- a/composer.json +++ b/composer.json @@ -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", 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,