Merge pull request PHP-DI#889 from staudenmeir/php8.4

Prepare for PHP 8.4

Author: mnapoli

.php-cs-fixer.php

@@ -57,7 +57,7 @@
  'php_unit_method_casing' => false,
  'blank_line_between_import_groups' => false,
  'global_namespace_import' => false,
- 'nullable_type_declaration_for_default_null_value' => false,
+ 'nullable_type_declaration_for_default_null_value' => true,
 ])
  ->setRiskyAllowed(true)
  ->setFinder($finder);

src/Container.php

@@ -89,8 +89,8 @@ public static function create(
  */
  public function __construct(
  array|MutableDefinitionSource $definitions = [],
- ProxyFactory $proxyFactory = null,
- ContainerInterface $wrapperContainer = null
+ ?ProxyFactory $proxyFactory = null,
+ ?ContainerInterface $wrapperContainer = null
  ) {
  if (is_array($definitions)) {
  $this->definitionSource = $this->createDefaultDefinitionSource($definitions);

src/ContainerBuilder.php

@@ -238,7 +238,7 @@ public function useAttributes(bool $bool) : self
  * @return $this
  * @throws InvalidArgumentException when writeToFile is set to true and the proxy directory is null
  */
- public function writeProxiesToFile(bool $writeToFile, string $proxyDirectory = null) : self
+ public function writeProxiesToFile(bool $writeToFile, ?string $proxyDirectory = null) : self
  {
  $this->ensureNotLocked();
 

src/Definition/Exception/InvalidDefinition.php

@@ -14,7 +14,7 @@
  */
 class InvalidDefinition extends \Exception implements ContainerExceptionInterface
 {
- public static function create(Definition $definition, string $message, \Exception $previous = null) : self
+ public static function create(Definition $definition, string $message, ?\Exception $previous = null) : self
  {
  return new self(sprintf(
  '%s' . \PHP_EOL . 'Full definition:' . \PHP_EOL . '%s',

src/Definition/Helper/CreateDefinitionHelper.php

@@ -43,7 +43,7 @@ class CreateDefinitionHelper implements DefinitionHelper
  * @param string|null $className Class name of the object.
  * If null, the name of the entry (in the container) will be used as class name.
  */
- public function __construct(string $className = null)
+ public function __construct(?string $className = null)
  {
  $this->className = $className;
  }

src/Definition/ObjectDefinition.php

@@ -52,7 +52,7 @@ class ObjectDefinition implements Definition
  /**
  * @param string $name Entry name
  */
- public function __construct(string $name, string $className = null)
+ public function __construct(string $name, ?string $className = null)
  {
  $this->name = $name;
  $this->setClassName($className);
@@ -159,7 +159,7 @@ public function completeFirstMethodInjection(MethodInjection $injection) : void
  }
  }
 
- public function setLazy(bool $lazy = null) : void
+ public function setLazy(?bool $lazy = null) : void
  {
  $this->lazy = $lazy;
  }

src/Definition/ObjectDefinition/PropertyInjection.php

@@ -29,7 +29,7 @@ class PropertyInjection
  * @param string $propertyName Property name
  * @param mixed $value Value that should be injected in the property
  */
- public function __construct(string $propertyName, mixed $value, string $className = null)
+ public function __construct(string $propertyName, mixed $value, ?string $className = null)
  {
  $this->propertyName = $propertyName;
  $this->value = $value;

src/Definition/Resolver/ParameterResolver.php

@@ -31,8 +31,8 @@ public function __construct(
  * @throws InvalidDefinition A parameter has no value defined or guessable.
  */
  public function resolveParameters(
- MethodInjection $definition = null,
- ReflectionMethod $method = null,
+ ?MethodInjection $definition = null,
+ ?ReflectionMethod $method = null,
  array $parameters = [],
  ) : array {
  $args = [];

src/Definition/Source/AttributeBasedAutowiring.php

@@ -31,7 +31,7 @@ class AttributeBasedAutowiring implements DefinitionSource, Autowiring
  /**
  * @throws InvalidAttribute
  */
- public function autowire(string $name, ObjectDefinition $definition = null) : ObjectDefinition|null
+ public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null
  {
  $className = $definition ? $definition->getClassName() : $name;
 
@@ -92,7 +92,7 @@ private function readProperties(ReflectionClass $class, ObjectDefinition $defini
  /**
  * @throws InvalidAttribute
  */
- private function readProperty(ReflectionProperty $property, ObjectDefinition $definition, string $classname = null) : void
+ private function readProperty(ReflectionProperty $property, ObjectDefinition $definition, ?string $classname = null) : void
  {
  if ($property->isStatic() || $property->isPromoted()) {
  return;

src/Definition/Source/Autowiring.php

@@ -19,5 +19,5 @@ interface Autowiring
  *
  * @throws InvalidDefinition An invalid definition was found.
  */
- public function autowire(string $name, ObjectDefinition $definition = null) : ObjectDefinition|null;
+ public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null;
 }