Skip to content

Commit

Permalink
Bootloading improvements (#840)
Browse files Browse the repository at this point in the history
  • Loading branch information
spiralbot committed Dec 8, 2022
1 parent d0a6a8f commit cc9307b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions tests/FactoryTest.php
Expand Up @@ -10,7 +10,7 @@
use Monolog\Processor\ProcessorInterface;
use Monolog\ResettableInterface;
use Psr\Log\LoggerInterface;
use Spiral\Boot\BootloadManager\BootloadManager;
use Spiral\Boot\BootloadManager\StrategyBasedBootloadManager;
use Spiral\Boot\Finalizer;
use Spiral\Boot\FinalizerInterface;
use Spiral\Config\ConfigManager;
Expand Down Expand Up @@ -70,7 +70,7 @@ public function load(string $section): array
$this->container->bind(FinalizerInterface::class, $finalizer = \Mockery::mock(FinalizerInterface::class));
$finalizer->shouldReceive('addFinalizer')->once();

$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->bind(LogFactory::class, $factory);

$this->assertSame($logger, $this->container->get(Logger::class));
Expand Down Expand Up @@ -112,7 +112,7 @@ public function load(string $section): array
$processor->shouldReceive('reset')->once();

$this->container->bind(LogFactory::class, $factory);
$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(LogsInterface::class)->getLogger();
$finalizer->finalize();
}
Expand Down Expand Up @@ -152,7 +152,7 @@ public function load(string $section): array
$processor->shouldReceive('reset')->never();

$this->container->bind(LogFactory::class, $factory);
$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(LogsInterface::class)->getLogger();
$finalizer->finalize(true);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/HandlersTest.php
Expand Up @@ -6,7 +6,7 @@

use Monolog\Handler\NullHandler;
use Monolog\Logger;
use Spiral\Boot\BootloadManager\BootloadManager;
use Spiral\Boot\BootloadManager\StrategyBasedBootloadManager;
use Spiral\Boot\FinalizerInterface;
use Spiral\Config\ConfigManager;
use Spiral\Config\ConfiguratorInterface;
Expand Down Expand Up @@ -42,7 +42,7 @@ public function load(string $section): array
}
));
$this->container->bindSingleton(ListenerRegistryInterface::class, new ListenerRegistry());
$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
}

public function testNoHandlers(): void
Expand Down
4 changes: 2 additions & 2 deletions tests/LoggerTest.php
Expand Up @@ -8,7 +8,7 @@
use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
use Monolog\Logger;
use Psr\Log\LoggerInterface;
use Spiral\Boot\BootloadManager\BootloadManager;
use Spiral\Boot\BootloadManager\StrategyBasedBootloadManager;
use Spiral\Boot\Finalizer;
use Spiral\Boot\FinalizerInterface;
use Spiral\Config\ConfigManager;
Expand Down Expand Up @@ -46,7 +46,7 @@ public function load(string $section): array

$injector->shouldReceive('createInjection')->once()->andReturn($logger);

$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(LoggerInterface::class);

$finalizer->finalize();
Expand Down
4 changes: 2 additions & 2 deletions tests/ProcessorsTest.php
Expand Up @@ -5,7 +5,7 @@
namespace Spiral\Tests\Monolog;

use Monolog\Processor\PsrLogMessageProcessor;
use Spiral\Boot\BootloadManager\BootloadManager;
use Spiral\Boot\BootloadManager\StrategyBasedBootloadManager;
use Spiral\Boot\FinalizerInterface;
use Spiral\Config\ConfigManager;
use Spiral\Config\ConfiguratorInterface;
Expand Down Expand Up @@ -40,7 +40,7 @@ public function load(string $section): array
}
));
$this->container->bindSingleton(ListenerRegistryInterface::class, new ListenerRegistry());
$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
}

public function testDefaultProcessor(): void
Expand Down
4 changes: 2 additions & 2 deletions tests/RotateHandlerTest.php
Expand Up @@ -6,7 +6,7 @@

use Monolog\Handler\RotatingFileHandler;
use Monolog\Logger;
use Spiral\Boot\BootloadManager\BootloadManager;
use Spiral\Boot\BootloadManager\StrategyBasedBootloadManager;
use Spiral\Boot\FinalizerInterface;
use Spiral\Config\ConfigManager;
use Spiral\Config\ConfiguratorInterface;
Expand Down Expand Up @@ -34,7 +34,7 @@ public function load(string $section): array
}
}
));
$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);

$autowire = new Container\Autowire('log.rotate', [
'filename' => 'monolog.log'
Expand Down
4 changes: 2 additions & 2 deletions tests/TraitTest.php
Expand Up @@ -6,7 +6,7 @@

use Monolog\Logger;
use Psr\Log\NullLogger;
use Spiral\Boot\BootloadManager\BootloadManager;
use Spiral\Boot\BootloadManager\StrategyBasedBootloadManager;
use Spiral\Boot\FinalizerInterface;
use Spiral\Config\ConfigManager;
use Spiral\Config\ConfiguratorInterface;
Expand Down Expand Up @@ -61,7 +61,7 @@ public function load(string $section): array
}
}
));
$this->container->get(BootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->get(StrategyBasedBootloadManager::class)->bootload([MonologBootloader::class]);
$this->container->bind(MonologConfig::class, new MonologConfig());
$this->container->bind(ListenerRegistryInterface::class, new ListenerRegistry());

Expand Down

0 comments on commit cc9307b

Please sign in to comment.