PHP 8.4 Implicit nullable types (#77)

Author: mondrake

src/Extension.php

@@ -23,7 +23,7 @@ class Extension implements ExtensionInterface
      */
     protected $map;
 
-    public function __construct(string $extension, string $map_class = null)
+    public function __construct(string $extension, ?string $map_class = null)
     {
         $this->extension = strtolower($extension);
         $this->map = MapHandler::map($map_class);

src/ExtensionInterface.php

@@ -15,7 +15,7 @@ interface ExtensionInterface
      * @param string $map_class
      *   (Optional) The FQCN of the map class to use.
      */
-    public function __construct(string $extension, string $map_class = null);
+    public function __construct(string $extension, ?string $map_class = null);
 
     /**
      * Returns the file extension's preferred MIME type.

src/Map/AbstractMap.php

@@ -64,17 +64,17 @@ public function hasExtension(string $extension): bool
         return (bool) $this->getMapEntry('e', $extension);
     }
 
-    public function listTypes(string $match = null): array
+    public function listTypes(?string $match = null): array
     {
         return $this->listEntries('t', $match);
     }
 
-    public function listAliases(string $match = null): array
+    public function listAliases(?string $match = null): array
     {
         return $this->listEntries('a', $match);
     }
 
-    public function listExtensions(string $match = null): array
+    public function listExtensions(?string $match = null): array
     {
         return $this->listEntries('e', $match);
     }

src/Map/BaseMap.php

@@ -91,7 +91,7 @@ public function sort(): MapInterface
      * @return array<int, int|string>
      *   The list of the entries.
      */
-    protected function listEntries(string $entry, string $match = null): array
+    protected function listEntries(string $entry, ?string $match = null): array
     {
         if (!isset(static::$map[$entry])) {
             return [];

src/Map/MimeMapInterface.php

@@ -37,7 +37,7 @@ public function hasExtension(string $extension): bool;
      *
      * @return array<int, int|string>
      */
-    public function listTypes(string $match = null): array;
+    public function listTypes(?string $match = null): array;
 
     /**
      * Lists all the MIME types aliases defined in the map.
@@ -46,7 +46,7 @@ public function listTypes(string $match = null): array;
      *
      * @return array<int, int|string>
      */
-    public function listAliases(string $match = null): array;
+    public function listAliases(?string $match = null): array;
 
     /**
      * Lists all the extensions defined in the map.
@@ -55,7 +55,7 @@ public function listAliases(string $match = null): array;
      *
      * @return array<int, int|string>
      */
-    public function listExtensions(string $match = null): array;
+    public function listExtensions(?string $match = null): array;
 
     /**
      * Adds a description of a MIME type.

src/MapHandler.php

@@ -41,7 +41,7 @@ public static function setDefaultMapClass(string $map_class): void
      *   (Optional) The map FQCN to be used. If null, the default map will be
      *   used.
      */
-    public static function map(string $map_class = null): MimeMapInterface
+    public static function map(?string $map_class = null): MimeMapInterface
     {
         if ($map_class === null) {
             $map_class = static::$defaultMapClass;

src/Type.php

@@ -73,7 +73,7 @@ class Type implements TypeInterface
      */
     protected $map;
 
-    public function __construct(string $type_string, string $map_class = null)
+    public function __construct(string $type_string, ?string $map_class = null)
     {
         TypeParser::parse($type_string, $this);
         $this->map = MapHandler::map($map_class);
@@ -104,7 +104,7 @@ public function getMediaComment(): string
         throw new UndefinedException('Media comment is not defined');
     }
 
-    public function setMediaComment(string $comment = null): TypeInterface
+    public function setMediaComment(?string $comment = null): TypeInterface
     {
         $this->mediaComment = $comment;
         return $this;
@@ -135,7 +135,7 @@ public function getSubTypeComment(): string
         throw new UndefinedException('Subtype comment is not defined');
     }
 
-    public function setSubTypeComment(string $comment = null): TypeInterface
+    public function setSubTypeComment(?string $comment = null): TypeInterface
     {
         $this->subTypeComment = $comment;
         return $this;
@@ -167,7 +167,7 @@ public function getParameter(string $name): TypeParameter
         throw new UndefinedException("Parameter $name is not defined");
     }
 
-    public function addParameter(string $name, string $value, string $comment = null): void
+    public function addParameter(string $name, string $value, ?string $comment = null): void
     {
         $this->parameters[$name] = new TypeParameter($name, $value, $comment);
     }

src/TypeInterface.php

@@ -17,7 +17,7 @@ interface TypeInterface
      * @param string $map_class
      *   (Optional) The FQCN of the map class to use.
      */
-    public function __construct(string $type_string, string $map_class = null);
+    public function __construct(string $type_string, ?string $map_class = null);
 
     /**
      * Gets a MIME type's media.
@@ -48,7 +48,7 @@ public function getMediaComment(): string;
      *
      * @param string $comment (optional) a comment; when missing any existing comment is removed.
      */
-    public function setMediaComment(string $comment = null): TypeInterface;
+    public function setMediaComment(?string $comment = null): TypeInterface;
 
     /**
      * Gets a MIME type's subtype.
@@ -77,7 +77,7 @@ public function getSubTypeComment(): string;
      *
      * @param string $comment (optional) a comment; when missing any existing comment is removed.
      */
-    public function setSubTypeComment(string $comment = null): TypeInterface;
+    public function setSubTypeComment(?string $comment = null): TypeInterface;
 
     /**
      * Checks if the MIME type has any parameter.
@@ -110,7 +110,7 @@ public function getParameter(string $name): TypeParameter;
     /**
      * Add a parameter to this type
      */
-    public function addParameter(string $name, string $value, string $comment = null): void;
+    public function addParameter(string $name, string $value, ?string $comment = null): void;
 
     /**
      * Remove a parameter from this type.

src/TypeParameter.php

@@ -35,7 +35,7 @@ class TypeParameter
      * @param string $value   Parameter value.
      * @param string $comment Comment for this parameter.
      */
-    public function __construct(string $name, string $value, string $comment = null)
+    public function __construct(string $name, string $value, ?string $comment = null)
     {
         $this->name = $name;
         $this->value = $value;