From 046be3b0b16e2003016283761c917a5d90591761 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 29 Dec 2024 03:24:50 +0700 Subject: [PATCH] drop aura/di support --- composer.json | 2 -- phpstan-baseline.neon | 12 ----------- spec/Middleware/MezzioFactorySpec.php | 29 --------------------------- src/Middleware/MezzioFactory.php | 3 --- src/Transformer/AuraService.php | 26 ------------------------ 5 files changed, 72 deletions(-) delete mode 100644 src/Transformer/AuraService.php diff --git a/composer.json b/composer.json index 94f93239..f56424b5 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "twig", "plates", "symfony", - "aura", "pimple" ], "homepage": "https://github.com/samsonasik/ErrorHeroModule", @@ -57,7 +56,6 @@ "laminas/laminas-mvc-console": "*" }, "require-dev": { - "aura/di": "^3.4 || ^4.2.1", "doctrine/dbal": "^3.9.3", "doctrine/doctrine-orm-module": "^4.2.1 || ^5.3", "kahlan/kahlan": "^5.2.8", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 8e5fd643..2b727fc8 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1080,18 +1080,6 @@ parameters: count: 1 path: src/Module.php - - - message: '#^Cannot access property \$locked on mixed\.$#' - identifier: property.nonObject - count: 1 - path: src/Transformer/AuraService.php - - - - message: '#^Method ErrorHeroModule\\Transformer\\AuraService\:\:transform\(\) has parameter \$configuration with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: src/Transformer/AuraService.php - - message: '#^Method ErrorHeroModule\\Transformer\\Doctrine\:\:transform\(\) has parameter \$configuration with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue diff --git a/spec/Middleware/MezzioFactorySpec.php b/spec/Middleware/MezzioFactorySpec.php index 36fe4efe..f4be5d18 100644 --- a/spec/Middleware/MezzioFactorySpec.php +++ b/spec/Middleware/MezzioFactorySpec.php @@ -2,9 +2,6 @@ namespace ErrorHeroModule\Spec\Middleware; -use ArrayObject; -use Aura\Di\Container as AuraContainer; -use Aura\Di\ContainerBuilder as AuraContainerBuilder; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\PDO\MySql\Driver; use Doctrine\ORM\EntityManager; @@ -26,7 +23,6 @@ given('factory', fn() : MezzioFactory => new MezzioFactory()); given('mapCreateContainers', fn() : array => [ - AuraContainer::class => (new AuraContainerBuilder())->newInstance(), SymfonyContainerBuilder::class => new SymfonyContainerBuilder(), Psr11PimpleContainer::class => new Psr11PimpleContainer(new PimpleContainer()), ]); @@ -202,15 +198,9 @@ $config = []; foreach ($this->mapCreateContainers as $containerClass => $container) { - if ($container instanceof AuraContainer) { - $config = new ArrayObject($config); - } allow($container)->toReceive('get')->with('config') ->andReturn($config); - if ($container instanceof AuraContainer) { - $config = $config->getArrayCopy(); - } allow($container)->toReceive('has')->with(EntityManager::class)->andReturn(false); @@ -242,16 +232,9 @@ foreach ($this->mapCreateContainers as $mapCreateContainer) { $config['log']['ErrorHeroModuleLogger']['writers'][0]['options']['db'] = AdapterInterface::class; - if ($mapCreateContainer instanceof AuraContainer) { - $config = new ArrayObject($config); - } allow($mapCreateContainer)->toReceive('get')->with('config') ->andReturn($config); - if ($mapCreateContainer instanceof AuraContainer) { - $config = $config->getArrayCopy(); - } - allow($mapCreateContainer)->toReceive('has')->with(EntityManager::class)->andReturn(false); $logging = Double::instance(['extends' => Logging::class, 'methods' => '__construct']); @@ -275,15 +258,9 @@ foreach ($this->mapCreateContainers as $mapCreateContainer) { $config = $this->config; $config['log']['ErrorHeroModuleLogger']['writers'][0]['options']['db'] = 'my-adapter'; - if ($mapCreateContainer instanceof AuraContainer) { - $config = new ArrayObject($config); - } allow($mapCreateContainer)->toReceive('get')->with('config') ->andReturn($config); - if ($mapCreateContainer instanceof AuraContainer) { - $config = $config->getArrayCopy(); - } allow($mapCreateContainer)->toReceive('has')->with(EntityManager::class)->andReturn(false); @@ -307,15 +284,9 @@ $config = $this->config; foreach ($this->mapCreateContainers as $mapCreateContainer) { - if ($mapCreateContainer instanceof AuraContainer) { - $config = new ArrayObject($config); - } allow($mapCreateContainer)->toReceive('get')->with('config') ->andReturn($config); - if ($mapCreateContainer instanceof AuraContainer) { - $config = $config->getArrayCopy(); - } allow($mapCreateContainer)->toReceive('has')->with(EntityManager::class)->andReturn(false); diff --git a/src/Middleware/MezzioFactory.php b/src/Middleware/MezzioFactory.php index 61a61540..5007ccc5 100644 --- a/src/Middleware/MezzioFactory.php +++ b/src/Middleware/MezzioFactory.php @@ -5,10 +5,8 @@ namespace ErrorHeroModule\Middleware; use ArrayObject; -use Aura\Di\Container as AuraContainer; use Doctrine\ORM\EntityManager; use ErrorHeroModule\Handler\Logging; -use ErrorHeroModule\Transformer\AuraService; use ErrorHeroModule\Transformer\Doctrine; use ErrorHeroModule\Transformer\PimpleService; use ErrorHeroModule\Transformer\SymfonyService; @@ -29,7 +27,6 @@ final class MezzioFactory /** @var array */ private const CONTAINERS_TRANSFORM = [ ContainerBuilder::class => SymfonyService::class, - AuraContainer::class => AuraService::class, Psr11PimpleContainer::class => PimpleService::class, ]; diff --git a/src/Transformer/AuraService.php b/src/Transformer/AuraService.php deleted file mode 100644 index 933f7443..00000000 --- a/src/Transformer/AuraService.php +++ /dev/null @@ -1,26 +0,0 @@ - $container->locked, null, $container)($container); - $containerLocked = false; - - return $container->set('ErrorHeroModuleLogger', $logger); - } -}