chore: Remove the ResettableContainerInterface artifcats (#216)

`ResettableContainerInterface` was a legacy piece from Symfony 4.4 which is no longer needed.

To also clarify the existence of `ResetInterface`, `symfony/service-contracts` is made into a direct dependency rather than a transitive one.

Author: theofidry

composer.json

@@ -22,6 +22,7 @@
         "symfony/dependency-injection": "^5.4 || ^6.0",
         "symfony/deprecation-contracts": "^2.5 || ^3.1",
         "symfony/process": "^5.4 || ^6.0",
+        "symfony/service-contracts": "^3.3",
         "thecodingmachine/safe": "^1.3.3 || ^2.4",
         "webmozart/assert": "^1.5"
     },

phpstan-src.neon.dist

@@ -4,9 +4,6 @@ parameters:
         - bin/set-composer-conflicts.php
         - src
     ignoreErrors:
-        - path: src/ErrorHandler/ResetServiceErrorHandler.php
-          message: '#ResettableContainerInterface#'
-
         # This is due to usages of func_get_args()
         - path: src/Logger/DecoratorLogger.php
           message: '#Parameter \#1#'

src/ErrorHandler/ResetServiceErrorHandler.php

@@ -14,25 +14,17 @@
 namespace Webmozarts\Console\Parallelization\ErrorHandler;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Contracts\Service\ResetInterface;
 use Throwable;
 use Webmozarts\Console\Parallelization\Logger\Logger;
-use function interface_exists;
 
 final class ResetServiceErrorHandler implements ErrorHandler
 {
-    /**
-     * @var ResetInterface|ResettableContainerInterface
-     */
-    private $resettable;
+    private ResetInterface $resettable;
     private ErrorHandler $decoratedErrorHandler;
 
-    /**
-     * @param ResetInterface|ResettableContainerInterface $resettable
-     */
     public function __construct(
-        $resettable,
+        ResetInterface $resettable,
         ?ErrorHandler $decoratedErrorHandler = null
     ) {
         $this->resettable = $resettable;
@@ -41,7 +33,7 @@ public function __construct(
 
     public static function forContainer(?ContainerInterface $container): ErrorHandler
     {
-        return null !== $container && self::isResettable($container)
+        return $container instanceof ResetInterface
             ? new self($container)
             : new NullErrorHandler();
     }
@@ -52,17 +44,4 @@ public function handleError(string $item, Throwable $throwable, Logger $logger):
 
         return $this->decoratedErrorHandler->handleError($item, $throwable, $logger);
     }
-
-    private static function isResettable(ContainerInterface $container): bool
-    {
-        return (
-            interface_exists(ResetInterface::class)
-            && $container instanceof ResetInterface
-        )
-            // TODO: to remove once we drop Symfony 4.4 support.
-            || (
-                interface_exists(ResettableContainerInterface::class)
-            && $container instanceof ResettableContainerInterface
-            );
-    }
 }