Fix additional issues

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
mockery · Mar 22, 2024 · 1c67601 · 1c67601
1 parent 08b2a0a
commit 1c67601
Show file tree

Hide file tree

Showing 10 changed files with 204 additions and 801 deletions.
diff --git a/library/Mockery/Generator/DefinedTargetClass.php b/library/Mockery/Generator/DefinedTargetClass.php
@@ -33,8 +33,8 @@ class DefinedTargetClass implements TargetClassInterface
     private $rfc;
 
     /**
-     * @param ReflectionClass $rfc
-     * @param class-string|null     $alias
+     * @param ReflectionClass   $rfc
+     * @param class-string|null $alias
      */
     public function __construct(ReflectionClass $rfc, $alias = null)
     {
@@ -51,7 +51,7 @@ public function __toString()
     }
 
     /**
-     * @param  class-string $name
+     * @param  class-string      $name
      * @param  class-string|null $alias
      * @return self
      */

diff --git a/library/Mockery/Generator/MockConfiguration.php b/library/Mockery/Generator/MockConfiguration.php
@@ -11,7 +11,7 @@
 namespace Mockery\Generator;
 
 use Mockery\Exception;
-use ReflectionMethod;
+use Serializable;
 use function array_filter;
 use function array_keys;
 use function array_map;
@@ -33,8 +33,6 @@
 use function strpos;
 use function strtolower;
 use function trait_exists;
-use Serializable;
-use Mockery\Generator\TargetClassInterface;
 
 /**
  * This class describes the configuration of mocks and hides away some of the
@@ -47,7 +45,7 @@ class MockConfiguration
      *
      * @var list<Method>
      */
-    protected $allMethods;
+    protected $allMethods = [];
 
     /**
      * Methods that should specifically not be mocked
@@ -81,6 +79,8 @@ class MockConfiguration
 
     /**
      * Param overrides
+     *
+     * @var array<string,mixed>
      */
     protected $parameterOverrides = [];
 
@@ -134,14 +134,14 @@ class MockConfiguration
     protected $whiteListedMethods = [];
 
     /**
-     * @param array<class-string|object> $targets
-     * @param array<string>              $blackListedMethods
-     * @param array<string>              $whiteListedMethods
-     * @param string|null                $name
-     * @param bool                       $instanceMock
-     * @param array<string,mixed>       $parameterOverrides
-     * @param bool                       $mockOriginalDestructor
-     * @param array<string,array<scalar>|scalar>       $constantsMap
+     * @param array<class-string|object>         $targets
+     * @param array<string>                      $blackListedMethods
+     * @param array<string>                      $whiteListedMethods
+     * @param string|null                        $name
+     * @param bool                               $instanceMock
+     * @param array<string,mixed>                $parameterOverrides
+     * @param bool                               $mockOriginalDestructor
+     * @param array<string,array<scalar>|scalar> $constantsMap
      */
     public function __construct(
         array $targets = [],
@@ -172,9 +172,6 @@ public function generateName()
     {
         $nameBuilder = new MockNameBuilder();
 
-        /**
-         * @var object|null $targetObject
-         */
         $targetObject = $this->getTargetObject();
         if ($targetObject !== null) {
             $className = get_class($targetObject);
@@ -309,7 +306,9 @@ public function getName()
         return $this->name;
     }
 
-    /** @return string */
+    /**
+     * @return string
+     */
     public function getNamespaceName()
     {
         $parts = explode('\\', $this->getName());

diff --git a/library/Mockery/Generator/Parameter.php b/library/Mockery/Generator/Parameter.php
@@ -15,7 +15,6 @@
 use ReflectionParameter;
 use function class_exists;
 
-
 /**
  * @mixin ReflectionParameter
  */

diff --git a/library/Mockery/Generator/StringManipulation/Pass/InterfacePass.php b/library/Mockery/Generator/StringManipulation/Pass/InterfacePass.php
@@ -32,7 +32,7 @@ public function apply($code, MockConfiguration $config)
             }
         }
 
-        $interfaces = array_reduce((array) $config->getTargetInterfaces(), static function ($code, $i) {
+        $interfaces = array_reduce($config->getTargetInterfaces(), static function ($code, $i) {
             return $code . ', \\' . ltrim($i->getName(), '\\');
         }, '');
 

diff --git a/library/Mockery/Generator/StringManipulationGenerator.php b/library/Mockery/Generator/StringManipulationGenerator.php
@@ -30,14 +30,14 @@
 class StringManipulationGenerator implements Generator
 {
     /**
-     * @var string
+     * @var list<Pass>
      */
-    private $code;
+    protected $passes = [];
 
     /**
-     * @var list<Pass>
+     * @var string
      */
-    protected $passes = [];
+    private $code;
 
     /**
      * @param list<Pass> $passes
@@ -50,7 +50,7 @@ public function __construct(array $passes)
     }
 
     /**
-     * @param Pass $pass
+     * @param  Pass $pass
      * @return void
      */
     public function addPass(Pass $pass)

diff --git a/library/Mockery/Generator/TargetClassInterface.php b/library/Mockery/Generator/TargetClassInterface.php
@@ -10,10 +10,6 @@
 
 namespace Mockery\Generator;
 
-use ReflectionMethod;
-use Mockery\Generator\TargetClassInterface;
-use Mockery\Generator\Method;
-
 interface TargetClassInterface
 {
     /**

diff --git a/library/Mockery/Generator/UndefinedTargetClass.php b/library/Mockery/Generator/UndefinedTargetClass.php
@@ -10,12 +10,10 @@
 
 namespace Mockery\Generator;
 
-use ReflectionMethod;
 use function array_pop;
 use function explode;
 use function implode;
 use function ltrim;
-use Mockery\Generator\TargetClassInterface;
 
 class UndefinedTargetClass implements TargetClassInterface
 {