[PHP 8.4] Fixes for implicit nullability deprecation (#1398)

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
mockery · Mar 18, 2024 · 814cae2 · 814cae2
2 parents c9cf52d + cbb5798
commit 814cae2
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/library/Mockery.php b/library/Mockery.php
@@ -247,7 +247,7 @@ public static function fetchMock($name)
      *
      * @return string
      */
-    public static function formatArgs($method, array $arguments = null)
+    public static function formatArgs($method, ?array $arguments = null)
     {
         if ($arguments === null) {
             return $method . '()';
@@ -266,7 +266,7 @@ public static function formatArgs($method, array $arguments = null)
      *
      * @return string
      */
-    public static function formatObjects(array $objects = null)
+    public static function formatObjects(?array $objects = null)
     {
         static $formatting;
 

diff --git a/library/Mockery/Container.php b/library/Mockery/Container.php
@@ -101,7 +101,7 @@ class Container
      */
     protected $instantiator;
 
-    public function __construct(Generator $generator = null, LoaderInterface $loader = null, Instantiator $instantiator = null)
+    public function __construct(?Generator $generator = null, ?LoaderInterface $loader = null, ?Instantiator $instantiator = null)
     {
         $this->_generator = $generator instanceof Generator ? $generator : Mockery::getDefaultGenerator();
         $this->_loader = $loader instanceof LoaderInterface ? $loader : Mockery::getDefaultLoader();

diff --git a/library/Mockery/Expectation.php b/library/Mockery/Expectation.php
@@ -362,7 +362,7 @@ public function andSet($name, ...$values)
      *
      * @return self
      */
-    public function andThrow($exception, $message = '', $code = 0, \Exception $previous = null)
+    public function andThrow($exception, $message = '', $code = 0, ?\Exception $previous = null)
     {
         $this->_throw = true;
 
@@ -391,7 +391,7 @@ public function andThrowExceptions(array $exceptions)
         return $this->andReturnValues($exceptions);
     }
 
-    public function andThrows($exception, $message = '', $code = 0, \Exception $previous = null)
+    public function andThrows($exception, $message = '', $code = 0, ?\Exception $previous = null)
     {
         return $this->andThrow($exception, $message, $code, $previous);
     }

diff --git a/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php b/library/Mockery/Generator/StringManipulation/Pass/MagicMethodTypeHintsPass.php
@@ -79,7 +79,7 @@ public function apply($code, MockConfiguration $config)
      *
      * @return array
      */
-    public function getMagicMethods(TargetClassInterface $class = null)
+    public function getMagicMethods(?TargetClassInterface $class = null)
     {
         if (! $class instanceof TargetClassInterface) {
             return [];

diff --git a/library/Mockery/LegacyMockInterface.php b/library/Mockery/LegacyMockInterface.php
@@ -107,7 +107,7 @@ public function mockery_getName();
      *
      * @return void
      */
-    public function mockery_init(Container $container = null, $partialObject = null);
+    public function mockery_init(?Container $container = null, $partialObject = null);
 
     /**
      * @return bool
@@ -220,7 +220,7 @@ public function shouldIgnoreMissing($returnValue = null);
      *
      * @return mixed
      */
-    public function shouldNotHaveBeenCalled(array $args = null);
+    public function shouldNotHaveBeenCalled(?array $args = null);
 
     /**
      * @param string $method

diff --git a/library/Mockery/Mock.php b/library/Mockery/Mock.php
@@ -181,7 +181,7 @@ class Mock implements MockInterface
      * @param bool $instanceMock
      * @return void
      */
-    public function mockery_init(Container $container = null, $partialObject = null, $instanceMock = true)
+    public function mockery_init(?Container $container = null, $partialObject = null, $instanceMock = true)
     {
         if (is_null($container)) {
             $container = new Container();
@@ -839,7 +839,7 @@ public function shouldNotHaveReceived($method = null, $args = null)
         return null;
     }
 
-    public function shouldNotHaveBeenCalled(array $args = null)
+    public function shouldNotHaveBeenCalled(?array $args = null)
     {
         return $this->shouldNotHaveReceived('__invoke', $args);
     }

diff --git a/tests/Mockery/ContainerTest.php b/tests/Mockery/ContainerTest.php
@@ -1777,7 +1777,7 @@ public function foo(callable $baz)
         $baz();
     }
 
-    public function bar(callable $callback = null)
+    public function bar(?callable $callback = null)
     {
         $callback();
     }
@@ -1864,7 +1864,7 @@ public static function keepMe($b)
 
 class MockeryTest_MethodWithRequiredParamWithDefaultValue
 {
-    public function foo(DateTime $bar = null, $baz)
+    public function foo(?DateTime $bar = null, $baz)
     {
     }
 }

diff --git a/tests/Mockery/Fixtures/MethodWithNullableTypedParameter.php b/tests/Mockery/Fixtures/MethodWithNullableTypedParameter.php
@@ -27,7 +27,7 @@ public function foo(?string $bar)
     {
     }
 
-    public function bar(string $bar = null)
+    public function bar(?string $bar = null)
     {
     }
 

diff --git a/tests/Mockery/Fixtures/MethodWithParametersWithDefaultValues.php b/tests/Mockery/Fixtures/MethodWithParametersWithDefaultValues.php
@@ -27,7 +27,7 @@ public function foo($bar = null)
     {
     }
 
-    public function bar(string $bar = null)
+    public function bar(?string $bar = null)
     {
     }
 }