Improve ClassAttributesPass for Dynamic Properties (#1244)

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
mockery · Apr 23, 2023 · d168331 · d168331
2 parents b64176d + b089e1b
commit d168331
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -85,7 +85,7 @@
         "psalm:dry-run": "vendor/bin/psalm --alter --issues=all --dry-run",
         "psalm:missing": "vendor/bin/psalm --alter --issues=MissingReturnType",
         "psalm:security": "vendor/bin/psalm --taint-analysis",
-        "psalm:shepherd": "vendor/bin/psalm --shepherd --stats --no-diff --no-cache",
+        "psalm:shepherd": "vendor/bin/psalm --shepherd --show-info=false --stats --no-diff --no-cache",
         "test": [
             "@phpunit",
             "@psalm"

diff --git a/library/Mockery/Generator/DefinedTargetClass.php b/library/Mockery/Generator/DefinedTargetClass.php
@@ -21,21 +21,27 @@
 namespace Mockery\Generator;
 
 use ReflectionAttribute;
+use ReflectionClass;
+
+use function array_map;
+use function array_unique;
+
+use const PHP_VERSION_ID;
 
 class DefinedTargetClass implements TargetClassInterface
 {
     private $rfc;
     private $name;
 
-    public function __construct(\ReflectionClass $rfc, $alias = null)
+    public function __construct(ReflectionClass $rfc, $alias = null)
     {
         $this->rfc = $rfc;
         $this->name = $alias === null ? $rfc->getName() : $alias;
     }
 
     public static function factory($name, $alias = null)
     {
-        return new self(new \ReflectionClass($name), $alias);
+        return new self(new ReflectionClass($name), $alias);
     }
 
     public function getAttributes()
@@ -44,10 +50,10 @@ public function getAttributes()
             return [];
         }
 
-        return array_map(
-            static fn (ReflectionAttribute $attribute): string => $attribute->getName(),
+        return array_unique(['\AllowDynamicProperties', ...array_map(
+            static fn (ReflectionAttribute $attribute): string => '\\' . $attribute->getName(),
             $this->rfc->getAttributes()
-        );
+        )]);
     }
 
     public function getName()

diff --git a/library/Mockery/Generator/StringManipulation/Pass/ClassAttributesPass.php b/library/Mockery/Generator/StringManipulation/Pass/ClassAttributesPass.php
@@ -14,14 +14,13 @@ public function apply($code, MockConfiguration $config)
             return $code;
         }
 
+        /** @var array<string> $attributes */
         $attributes = $class->getAttributes();
 
-        if (!empty($attributes)) {
-            $attributes = '#[' . implode(',', $attributes) . ']' . PHP_EOL;
-
+        if ($attributes !== []) {
             return str_replace(
-                'class Mock',
-                $attributes . ' class Mock',
+                '#[\AllowDynamicProperties]',
+                '#[' . implode(',', $attributes) . ']',
                 $code
             );
         }

diff --git a/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php b/library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php
@@ -78,12 +78,12 @@ protected function renderParams(Method $method, $config)
                 if (false !== $param->isDefaultValueAvailable()) {
                     $defaultValue = $param->getDefaultValue();
 
-                    if (is_object($defaultValue)){
+                    if (is_object($defaultValue)) {
                         $prefix = get_class($defaultValue);
                         if ($isPhp81 && enum_exists($prefix)) {
                             $prefix = var_export($defaultValue, true);
                         }
-                    }else{
+                    } else {
                         $prefix = var_export($defaultValue, true);
                     }
 

diff --git a/library/Mockery/Generator/UndefinedTargetClass.php b/library/Mockery/Generator/UndefinedTargetClass.php
@@ -20,6 +20,8 @@
 
 namespace Mockery\Generator;
 
+use const PHP_VERSION_ID;
+
 class UndefinedTargetClass implements TargetClassInterface
 {
     private $name;
@@ -36,11 +38,7 @@ public static function factory($name)
 
     public function getAttributes()
     {
-        if (\PHP_VERSION_ID < 80000) {
-            return [];
-        }
-
-        return ['\AllowDynamicProperties'];
+        return [];
     }
 
     public function getName()

diff --git a/library/Mockery/Mock.php b/library/Mockery/Mock.php
@@ -27,6 +27,7 @@
 use Mockery\MockInterface;
 use Mockery\Reflector;
 
+#[\AllowDynamicProperties]
 class Mock implements MockInterface
 {
     /**

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1382,11 +1382,9 @@
       <code>apply</code>
     </MissingReturnType>
     <MixedArgument>
-      <code>$attributes</code>
       <code>$code</code>
     </MixedArgument>
     <MixedAssignment>
-      <code>$attributes</code>
       <code>$class</code>
     </MixedAssignment>
     <MixedMethodCall>

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
-    phpVersion='8.1'
+    phpVersion='8.2'
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

diff --git a/tests/Mockery/Generator/StringManipulation/Pass/ClassAttributesPassTest.php b/tests/Mockery/Generator/StringManipulation/Pass/ClassAttributesPassTest.php
@@ -38,7 +38,7 @@ public function testCanApplyClassAttributes(
 
         $pass = new ClassAttributesPass();
 
-        $code = $pass->apply(static::CODE, $config);
+        $code = $pass->apply(file_get_contents(__FILE__), $config);
 
         self::assertStringContainsString($expected, $code);
     }

diff --git a/tests/PHP81/Php81LanguageFeaturesTest.php b/tests/PHP81/Php81LanguageFeaturesTest.php
@@ -8,6 +8,7 @@
 use ReturnTypeWillChange;
 use RuntimeException;
 use Serializable;
+
 use function pcntl_fork;
 use function pcntl_waitpid;
 use function pcntl_wexitstatus;