Fixing nullable parameters with non null default value

thecodingmachine · Nov 8, 2018 · 70cdfb7 · 70cdfb7
1 parent 222a915
commit 70cdfb7
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 7 deletions.
diff --git a/generated/fileinfo.php b/generated/fileinfo.php
@@ -43,7 +43,7 @@ function finfo_close($finfo): void
  * @throws FileinfoException
  *
  */
-function finfo_open(int $options = FILEINFO_NONE, string $magic_file = null)
+function finfo_open(int $options = FILEINFO_NONE, ?string $magic_file = null)
 {
     error_clear_last();
     $result = \finfo_open($options, $magic_file);

diff --git a/generated/image.php b/generated/image.php
@@ -18,7 +18,7 @@
  * @throws ImageException
  *
  */
-function image2wbmp($image, string $filename = null, int $foreground = null): void
+function image2wbmp($image, ?string $filename = null, int $foreground = null): void
 {
     error_clear_last();
     if ($foreground !== null) {
@@ -2396,7 +2396,7 @@ function imagewebp($image, $to = null, int $quality = 80): void
  * @throws ImageException
  *
  */
-function imagexbm($image, string $filename, int $foreground = null): void
+function imagexbm($image, ?string $filename, int $foreground = null): void
 {
     error_clear_last();
     if ($foreground !== null) {

diff --git a/generated/imap.php b/generated/imap.php
@@ -419,7 +419,7 @@ function imap_gc($imap_stream, int $caches): void
  * @throws ImapException
  *
  */
-function imap_headerinfo($imap_stream, int $msg_number, int $fromlength = 0, int $subjectlength = 0, string $defaulthost = null): object
+function imap_headerinfo($imap_stream, int $msg_number, int $fromlength = 0, int $subjectlength = 0, ?string $defaulthost = null): object
 {
     error_clear_last();
     $result = \imap_headerinfo($imap_stream, $msg_number, $fromlength, $subjectlength, $defaulthost);

diff --git a/generated/ldap.php b/generated/ldap.php
@@ -46,7 +46,7 @@ function ldap_add($link_identifier, string $dn, array $entry, array $serverctrls
  * @throws LdapException
  *
  */
-function ldap_bind($link_identifier, string $bind_rdn = null, string $bind_password = null): void
+function ldap_bind($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null): void
 {
     error_clear_last();
     $result = \ldap_bind($link_identifier, $bind_rdn, $bind_password);

diff --git a/generated/pcre.php b/generated/pcre.php
@@ -651,7 +651,7 @@ function preg_match(string $pattern, string $subject, array &$matches = null, in
  * @throws PcreException
  *
  */
-function preg_split(string $pattern, string $subject, int $limit = -1, int $flags = 0): array
+function preg_split(string $pattern, string $subject, ?int $limit = -1, int $flags = 0): array
 {
     error_clear_last();
     $result = \preg_split($pattern, $subject, $limit, $flags);

diff --git a/generator/src/Parameter.php b/generator/src/Parameter.php
@@ -80,6 +80,16 @@ public function isVariadic(): bool
         return $this->parameter->parameter->__toString() === '...';
     }
 
+    public function isNullable(): bool
+    {
+        if ($this->phpStanFunction !== null) {
+            $phpStanParameter = $this->phpStanFunction->getParameter($this->getParameter());
+            if ($phpStanParameter) {
+                return $phpStanParameter->isNullable();
+            }
+        }
+        return $this->hasDefaultValue() && $this->getDefaultValue() === 'null';
+    }
 
     /*
      * @return string

diff --git a/generator/src/PhpStanFunctions/PhpStanParameter.php b/generator/src/PhpStanFunctions/PhpStanParameter.php
@@ -28,6 +28,10 @@ class PhpStanParameter
      * @var bool
      */
     private $byReference = false;
+    /**
+     * @var bool
+     */
+    private $nullable = false;
 
     public function __construct(string $name, string $type)
     {
@@ -47,6 +51,7 @@ public function __construct(string $name, string $type)
 
         if (\strpos($type, '?') !== false) {
             $type = \str_replace('?', '', $type).'|null';
+            $this->nullable = true;
         }
 
         $this->type = $type;
@@ -91,4 +96,12 @@ public function isByReference(): bool
     {
         return $this->byReference;
     }
+
+    /**
+     * @return bool
+     */
+    public function isNullable(): bool
+    {
+        return $this->nullable;
+    }
 }
diff --git a/generator/src/WritePhpFunction.php b/generator/src/WritePhpFunction.php
@@ -138,7 +138,10 @@ private function displayParamsWithType(array $params): string
         foreach ($params as $param) {
             $paramAsString = '';
             if ($param->getType() !== 'mixed' && $param->getType() !== 'resource') {
-                $paramAsString = $param->getType().' ';
+                if ($param->isNullable()) {
+                    $paramAsString .= '?';
+                }
+                $paramAsString .= $param->getType().' ';
             }
 
             $paramName = $param->getParameter();