PHP-DI · mnapoli · Jul 16, 2024 · Jul 13, 2024 · Jul 13, 2024
diff --git a/.php-cs-fixer.php b/.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);
diff --git a/src/Container.php b/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);

diff --git a/src/ContainerBuilder.php b/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();
 

diff --git a/src/Definition/Exception/InvalidDefinition.php b/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',

diff --git a/src/Definition/Helper/CreateDefinitionHelper.php b/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;
     }

diff --git a/src/Definition/ObjectDefinition.php b/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;
     }

diff --git a/src/Definition/ObjectDefinition/PropertyInjection.php b/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;

diff --git a/src/Definition/Resolver/ParameterResolver.php b/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 = [];

diff --git a/src/Definition/Source/AttributeBasedAutowiring.php b/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;

diff --git a/src/Definition/Source/Autowiring.php b/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;
 }
diff --git a/src/Definition/Source/DefinitionArray.php b/src/Definition/Source/DefinitionArray.php
@@ -27,7 +27,7 @@ class DefinitionArray implements DefinitionSource, MutableDefinitionSource
 
     private DefinitionNormalizer $normalizer;
 
-    public function __construct(array $definitions = [], Autowiring $autowiring = null)
+    public function __construct(array $definitions = [], ?Autowiring $autowiring = null)
     {
         if (isset($definitions[0])) {
             throw new \Exception('The PHP-DI definition is not indexed by an entry name in the definition array');

diff --git a/src/Definition/Source/DefinitionFile.php b/src/Definition/Source/DefinitionFile.php
@@ -20,7 +20,7 @@ class DefinitionFile extends DefinitionArray
      */
     public function __construct(
         private string $file,
-        Autowiring $autowiring = null,
+        ?Autowiring $autowiring = null,
     ) {
         // Lazy-loading to improve performances
         parent::__construct([], $autowiring);

diff --git a/src/Definition/Source/DefinitionNormalizer.php b/src/Definition/Source/DefinitionNormalizer.php
@@ -37,7 +37,7 @@ public function __construct(
      *
      * @throws InvalidDefinition
      */
-    public function normalizeRootDefinition(mixed $definition, string $name, array $wildcardsReplacements = null) : Definition
+    public function normalizeRootDefinition(mixed $definition, string $name, ?array $wildcardsReplacements = null) : Definition
     {
         if ($definition instanceof DefinitionHelper) {
             $definition = $definition->getDefinition($name);

diff --git a/src/Definition/Source/NoAutowiring.php b/src/Definition/Source/NoAutowiring.php
@@ -14,7 +14,7 @@
  */
 class NoAutowiring implements Autowiring
 {
-    public function autowire(string $name, ObjectDefinition $definition = null) : ObjectDefinition|null
+    public function autowire(string $name, ?ObjectDefinition $definition = null) : ObjectDefinition|null
     {
         throw new InvalidDefinition(sprintf(
             'Cannot autowire entry "%s" because autowiring is disabled',

diff --git a/src/Definition/Source/ReflectionBasedAutowiring.php b/src/Definition/Source/ReflectionBasedAutowiring.php
@@ -16,7 +16,7 @@
  */
 class ReflectionBasedAutowiring implements DefinitionSource, Autowiring
 {
-    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;
 

diff --git a/src/Definition/Source/SourceCache.php b/src/Definition/Source/SourceCache.php
@@ -64,7 +64,7 @@ public function addDefinition(Definition $definition) : void
         throw new \LogicException('You cannot set a definition at runtime on a container that has caching enabled. Doing so would risk caching the definition for the next execution, where it might be different. You can either put your definitions in a file, remove the cache or ->set() a raw value directly (PHP object, string, int, ...) instead of a PHP-DI definition.');
     }
 
-    private function shouldBeCached(Definition $definition = null) : bool
+    private function shouldBeCached(?Definition $definition = null) : bool
     {
         return
             // Cache missing definitions

diff --git a/src/functions.php b/src/functions.php
@@ -30,7 +30,7 @@ function value(mixed $value) : ValueDefinition
      * @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.
      */
-    function create(string $className = null) : CreateDefinitionHelper
+    function create(?string $className = null) : CreateDefinitionHelper
     {
         return new CreateDefinitionHelper($className);
     }
@@ -43,7 +43,7 @@ function create(string $className = null) : CreateDefinitionHelper
      * @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.
      */
-    function autowire(string $className = null) : AutowireDefinitionHelper
+    function autowire(?string $className = null) : AutowireDefinitionHelper
     {
         return new AutowireDefinitionHelper($className);
     }