Remove BC layers related to new methods and new parameters

Author: nicolas-grekas

CHANGELOG.md

@@ -12,6 +12,8 @@ CHANGELOG
  * Remove `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use options `inline_factories` and `inline_class_loader` instead
  * Parameter names of `ParameterBag` cannot be numerics
  * Remove `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
+ * Add argument `$id` and `$asGhostObject` to `DumperInterface::isProxyCandidate()` and `getProxyCode()`
+ * Add argument `$source` to `FileLoader::registerClasses()`
 
 6.4
 ---

LazyProxy/PhpDumper/DumperInterface.php

@@ -23,10 +23,9 @@ interface DumperInterface
     /**
      * Inspects whether the given definitions should produce proxy instantiation logic in the dumped container.
      *
-     * @param bool|null   &$asGhostObject Set to true after the call if the proxy is a ghost object
-     * @param string|null $id
+     * @param bool|null &$asGhostObject Set to true after the call if the proxy is a ghost object
      */
-    public function isProxyCandidate(Definition $definition/* , bool &$asGhostObject = null, string $id = null */): bool;
+    public function isProxyCandidate(Definition $definition, bool &$asGhostObject = null, string $id = null): bool;
 
     /**
      * Generates the code to be used to instantiate a proxy in the dumped factory code.
@@ -35,8 +34,6 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
 
     /**
      * Generates the code for the lazy proxy.
-     *
-     * @param string|null $id
      */
-    public function getProxyCode(Definition $definition/* , string $id = null */): string;
+    public function getProxyCode(Definition $definition, string $id = null): string;
 }

Loader/FileLoader.php

@@ -98,7 +98,7 @@ public function import(mixed $resource, string $type = null, bool|string $ignore
      *
      * @return void
      */
-    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null/* , string $source = null */)
+    public function registerClasses(Definition $prototype, string $namespace, string $resource, string|array $exclude = null, string $source = null)
     {
         if (!str_ends_with($namespace, '\\')) {
             throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": "%s".', $namespace));
@@ -115,7 +115,6 @@ public function registerClasses(Definition $prototype, string $namespace, string
             throw new InvalidArgumentException('The exclude list must not contain an empty value.');
         }
 
-        $source = \func_num_args() > 4 ? func_get_arg(4) : null;
         $autoconfigureAttributes = new RegisterAutoconfigureAttributesPass();
         $autoconfigureAttributes = $autoconfigureAttributes->accept($prototype) ? $autoconfigureAttributes : null;
         $classes = $this->findClasses($namespace, $resource, (array) $exclude, $autoconfigureAttributes, $source);