Rename ItemProcessingErrorHandler into ErrorHandler (#114)

theofidry · web-flow · commit 58c551b120af · 2022-10-14T21:55:30.000Z
diff --git a/src/ErrorHandler/ErrorHandler.php b/src/ErrorHandler/ErrorHandler.php
@@ -16,7 +16,7 @@
 use Throwable;
 use Webmozarts\Console\Parallelization\Logger\Logger;
 
-interface ItemProcessingErrorHandler
+interface ErrorHandler
 {
     public function handleError(string $item, Throwable $throwable, Logger $logger): void;
 }
diff --git a/src/ErrorHandler/LoggingErrorHandler.php b/src/ErrorHandler/LoggingErrorHandler.php
@@ -15,11 +15,11 @@
 
 use Throwable;
 
-final class ItemProcessingErrorHandlerLogger implements ItemProcessingErrorHandler
+final class LoggingErrorHandler implements ErrorHandler
 {
-    private ItemProcessingErrorHandler $decoratedErrorHandler;
+    private ErrorHandler $decoratedErrorHandler;
 
-    public function __construct(ItemProcessingErrorHandler $decoratedErrorHandler)
+    public function __construct(ErrorHandler $decoratedErrorHandler)
     {
         $this->decoratedErrorHandler = $decoratedErrorHandler;
     }
diff --git a/src/ErrorHandler/ResetContainerErrorHandler.php b/src/ErrorHandler/ResetContainerErrorHandler.php
@@ -20,7 +20,7 @@
 use Webmozarts\Console\Parallelization\Logger\Logger;
 use Webmozarts\Console\Parallelization\Symfony\ResettableContainerInterface;
 
-final class ResetContainerErrorHandler implements ItemProcessingErrorHandler
+final class ResetContainerErrorHandler implements ErrorHandler
 {
     /**
      * @var (ContainerInterface&ResetInterface)|null
diff --git a/src/ParallelExecutor.php b/src/ParallelExecutor.php
@@ -27,7 +27,7 @@
 use Throwable;
 use function usleep;
 use Webmozart\Assert\Assert;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
 use Webmozarts\Console\Parallelization\Input\InputOptionsSerializer;
 use Webmozarts\Console\Parallelization\Input\ParallelizationInput;
 use Webmozarts\Console\Parallelization\Logger\Logger;
@@ -58,7 +58,7 @@ final class ParallelExecutor
 
     private InputDefinition $commandDefinition;
 
-    private ItemProcessingErrorHandler $errorHandler;
+    private ErrorHandler $errorHandler;
 
     /**
      * @var resource
@@ -129,7 +129,7 @@ public function __construct(
         callable $getItemName,
         string $commandName,
         InputDefinition $commandDefinition,
-        ItemProcessingErrorHandler $errorHandler,
+        ErrorHandler $errorHandler,
         $childSourceStream,
         int $batchSize,
         int $segmentSize,
diff --git a/src/ParallelExecutorFactory.php b/src/ParallelExecutorFactory.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
 use Webmozarts\Console\Parallelization\Process\PhpExecutableFinder;
 use Webmozarts\Console\Parallelization\Process\ProcessLauncherFactory;
 use Webmozarts\Console\Parallelization\Process\SymfonyProcessLauncherFactory;
@@ -46,7 +46,7 @@ final class ParallelExecutorFactory
 
     private InputDefinition $commandDefinition;
 
-    private ItemProcessingErrorHandler $errorHandler;
+    private ErrorHandler $errorHandler;
 
     /**
      * @var resource
@@ -117,7 +117,7 @@ private function __construct(
         callable $getItemName,
         string $commandName,
         InputDefinition $commandDefinition,
-        ItemProcessingErrorHandler $errorHandler,
+        ErrorHandler $errorHandler,
         $childSourceStream,
         int $batchSize,
         int $segmentSize,
@@ -164,7 +164,7 @@ public static function create(
         callable $getItemName,
         string $commandName,
         InputDefinition $commandDefinition,
-        ItemProcessingErrorHandler $errorHandler
+        ErrorHandler $errorHandler
     ): self {
         return new self(
             $fetchItems,
diff --git a/src/Parallelization.php b/src/Parallelization.php
@@ -20,8 +20,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Terminal;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandler;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandlerLogger;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\LoggingErrorHandler;
 use Webmozarts\Console\Parallelization\ErrorHandler\ResetContainerErrorHandler;
 use Webmozarts\Console\Parallelization\Input\ParallelizationInput;
 use Webmozarts\Console\Parallelization\Logger\DebugProgressBarFactory;
@@ -145,7 +145,7 @@ protected function getParallelExecutableFactory(
         callable $getItemName,
         string $commandName,
         InputDefinition $commandDefinition,
-        ItemProcessingErrorHandler $errorHandler
+        ErrorHandler $errorHandler
     ): ParallelExecutorFactory {
         return ParallelExecutorFactory::create(
             $fetchItems,
@@ -157,9 +157,9 @@ protected function getParallelExecutableFactory(
         );
     }
 
-    protected function createItemErrorHandler(): ItemProcessingErrorHandler
+    protected function createItemErrorHandler(): ErrorHandler
     {
-        return new ItemProcessingErrorHandlerLogger(
+        return new LoggingErrorHandler(
             new ResetContainerErrorHandler($this->getContainer()),
         );
     }
diff --git a/tests/ErrorHandler/Container/NonResettableContainer.php b/tests/ErrorHandler/Container/NonResettableContainer.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Webmozarts\Console\Parallelization\ErrorHandler;
+namespace Webmozarts\Console\Parallelization\ErrorHandler\Container;
 
 use DomainException;
 use Psr\Container\ContainerInterface;
diff --git a/tests/ErrorHandler/Container/ResetContainerErrorhandlerTest.php b/tests/ErrorHandler/Container/ResetContainerErrorhandlerTest.php
@@ -11,10 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Webmozarts\Console\Parallelization\ErrorHandler;
+namespace Webmozarts\Console\Parallelization\ErrorHandler\Container;
 
 use Error;
 use PHPUnit\Framework\TestCase;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\ResetContainerErrorHandler;
 use Webmozarts\Console\Parallelization\Logger\FakeLogger;
 
 /**
@@ -47,7 +49,7 @@ public function test_it_resets_the_container_if_the_container_is_resettable(): v
         self::assertTrue($container->reset);
     }
 
-    private static function handleError(ItemProcessingErrorHandler $errorHandler): void
+    private static function handleError(ErrorHandler $errorHandler): void
     {
         $errorHandler->handleError(
             'item0',
diff --git a/tests/ErrorHandler/Container/ResettableContainer.php b/tests/ErrorHandler/Container/ResettableContainer.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Webmozarts\Console\Parallelization\ErrorHandler;
+namespace Webmozarts\Console\Parallelization\ErrorHandler\Container;
 
 use DomainException;
 use Psr\Container\ContainerInterface;
diff --git a/tests/ErrorHandler/DummyErrorHandler.php b/tests/ErrorHandler/DummyErrorHandler.php
@@ -17,7 +17,7 @@
 use Throwable;
 use Webmozarts\Console\Parallelization\Logger\Logger;
 
-final class DummyErrorHandler implements ItemProcessingErrorHandler
+final class DummyErrorHandler implements ErrorHandler
 {
     public array $calls = [];
 
diff --git a/tests/ErrorHandler/FakeErrorHandler.php b/tests/ErrorHandler/FakeErrorHandler.php
@@ -17,7 +17,7 @@
 use Throwable;
 use Webmozarts\Console\Parallelization\Logger\Logger;
 
-final class FakeErrorHandler implements ItemProcessingErrorHandler
+final class FakeErrorHandler implements ErrorHandler
 {
     public function handleError(string $item, Throwable $throwable, Logger $logger): void
     {
diff --git a/tests/ErrorHandler/LoggingErrorHandlerTest.php b/tests/ErrorHandler/LoggingErrorHandlerTest.php
@@ -19,9 +19,9 @@
 use Webmozarts\Console\Parallelization\Logger\Logger;
 
 /**
- * @covers \Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandlerLogger
+ * @covers \Webmozarts\Console\Parallelization\ErrorHandler\LoggingErrorHandler
  */
-final class ItemProcessingErrorHandlerLoggerTest extends TestCase
+final class LoggingErrorHandlerTest extends TestCase
 {
     use ProphecyTrait;
 
@@ -30,13 +30,13 @@ public function test_it_logs_and_forwards_the_error_handling_to_the_decorated_er
         $item = 'item1';
         $throwable = new Error('An error occurred.');
 
-        $decoratedErrorHandlerProphecy = $this->prophesize(ItemProcessingErrorHandler::class);
+        $decoratedErrorHandlerProphecy = $this->prophesize(ErrorHandler::class);
         $decoratedErrorHandler = $decoratedErrorHandlerProphecy->reveal();
 
         $loggerProphecy = $this->prophesize(Logger::class);
         $logger = $loggerProphecy->reveal();
 
-        $errorHandler = new ItemProcessingErrorHandlerLogger($decoratedErrorHandler);
+        $errorHandler = new LoggingErrorHandler($decoratedErrorHandler);
 
         $decoratedErrorHandlerProphecy
             ->handleError($item, $throwable, $logger)
diff --git a/tests/Fixtures/Command/ImportMoviesCommand.php b/tests/Fixtures/Command/ImportMoviesCommand.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Console\Logger\ConsoleLogger;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Terminal;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
 use Webmozarts\Console\Parallelization\Integration\TestDebugProgressBarFactory;
 use Webmozarts\Console\Parallelization\Integration\TestLogger;
 use Webmozarts\Console\Parallelization\Logger\Logger;
@@ -78,7 +78,7 @@ protected function getParallelExecutableFactory(
         callable $getItemName,
         string $commandName,
         InputDefinition $commandDefinition,
-        ItemProcessingErrorHandler $errorHandler
+        ErrorHandler $errorHandler
     ): ParallelExecutorFactory {
         return $this
             ->getOriginalParallelExecutableFactory(
diff --git a/tests/Fixtures/Command/NoSubProcessCommand.php b/tests/Fixtures/Command/NoSubProcessCommand.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Console\Logger\ConsoleLogger;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Terminal;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
 use Webmozarts\Console\Parallelization\Integration\TestDebugProgressBarFactory;
 use Webmozarts\Console\Parallelization\Logger\Logger;
 use Webmozarts\Console\Parallelization\Logger\StandardLogger;
@@ -63,7 +63,7 @@ protected function getParallelExecutableFactory(
         callable $getItemName,
         string $commandName,
         InputDefinition $commandDefinition,
-        ItemProcessingErrorHandler $errorHandler
+        ErrorHandler $errorHandler
     ): ParallelExecutorFactory {
         return $this
             ->getOriginalParallelExecutableFactory(
diff --git a/tests/ParallelExecutorTest.php b/tests/ParallelExecutorTest.php
@@ -33,8 +33,8 @@
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Webmozarts\Console\Parallelization\ErrorHandler\DummyErrorHandler;
+use Webmozarts\Console\Parallelization\ErrorHandler\ErrorHandler;
 use Webmozarts\Console\Parallelization\ErrorHandler\FakeErrorHandler;
-use Webmozarts\Console\Parallelization\ErrorHandler\ItemProcessingErrorHandler;
 use Webmozarts\Console\Parallelization\Input\ParallelizationInput;
 use Webmozarts\Console\Parallelization\Logger\DummyLogger;
 use Webmozarts\Console\Parallelization\Logger\FakeLogger;
@@ -1042,7 +1042,7 @@ private static function mainProcessWithoutChildProcessLaunchedProvider(): iterab
      */
     private static function createChildProcessExecutor(
         callable $runSingleCommand,
-        ItemProcessingErrorHandler $errorHandler,
+        ErrorHandler $errorHandler,
         $childSourceStream,
         int $batchSize,
         callable $runBeforeFirstCommand,
@@ -1087,7 +1087,7 @@ private static function createChildProcessExecutor(
     private static function createMainProcessExecutor(
         array $items,
         callable $runSingleCommand,
-        ItemProcessingErrorHandler $errorHandler,
+        ErrorHandler $errorHandler,
         int $batchSize,
         int $segmentSize,
         callable $runBeforeFirstCommand,

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Throwable;`
`17`	`17`	`use Webmozarts\Console\Parallelization\Logger\Logger;`
`18`	`18`
`19`		`-interface ItemProcessingErrorHandler`
	`19`	`+interface ErrorHandler`
`20`	`20`	`{`
`21`	`21`	`public function handleError(string $item, Throwable $throwable, Logger $logger): void;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`
`16`	`16`	`use Throwable;`
`17`	`17`
`18`		`-final class ItemProcessingErrorHandlerLogger implements ItemProcessingErrorHandler`
	`18`	`+final class LoggingErrorHandler implements ErrorHandler`
`19`	`19`	`{`
`20`		`- private ItemProcessingErrorHandler $decoratedErrorHandler;`
	`20`	`+ private ErrorHandler $decoratedErrorHandler;`
`21`	`21`
`22`		`- public function __construct(ItemProcessingErrorHandler $decoratedErrorHandler)`
	`22`	`+ public function __construct(ErrorHandler $decoratedErrorHandler)`
`23`	`23`	`{`
`24`	`24`	`$this->decoratedErrorHandler = $decoratedErrorHandler;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use Webmozarts\Console\Parallelization\Logger\Logger;`
`21`	`21`	`use Webmozarts\Console\Parallelization\Symfony\ResettableContainerInterface;`
`22`	`22`
`23`		`-final class ResetContainerErrorHandler implements ItemProcessingErrorHandler`
	`23`	`+final class ResetContainerErrorHandler implements ErrorHandler`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`	`26`	`* @var (ContainerInterface&ResetInterface)\|null`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use Throwable;`
`18`	`18`	`use Webmozarts\Console\Parallelization\Logger\Logger;`
`19`	`19`
`20`		`-final class DummyErrorHandler implements ItemProcessingErrorHandler`
	`20`	`+final class DummyErrorHandler implements ErrorHandler`
`21`	`21`	`{`
`22`	`22`	`public array $calls = [];`
`23`	`23`