Merge branch 'master' into issues/557

phpspec · Nov 29, 2022 · 8ed6049 · 8ed6049
2 parents 3f007e2 + c5281eb
commit 8ed6049
Show file tree

Hide file tree

Showing 20 changed files with 194 additions and 154 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,15 +15,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.2, 7.3, 7.4, 8.0]
+        php: ["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]
         composer-flags: [ "" ]
         experimental: [false]
         include:
           - php: 7.2
             composer-flags: "--prefer-lowest"
             experimental: false
-          - php: 8.1
-            experimental: true
 
     steps:
       -   uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     ],
 
     "require": {
-        "php":                               "^7.2 || ~8.0, <8.2",
+        "php":                               "^7.2 || 8.0.* || 8.1.* || 8.2.*",
         "phpdocumentor/reflection-docblock": "^5.2",
         "sebastian/comparator":              "^3.0 || ^4.0",
         "doctrine/instantiator":             "^1.2",

diff --git a/fixtures/DnfArgumentType.php b/fixtures/DnfArgumentType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Fixtures\Prophecy;
+
+class DnfArgumentType
+{
+    public function doSomething ((A&B)|C $foo)
+    {
+
+    }
+}
diff --git a/fixtures/DnfReturnType.php b/fixtures/DnfReturnType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Fixtures\Prophecy;
+
+class DnfReturnType
+{
+    public function doSomething () : (A&B)|C
+    {
+
+    }
+}
diff --git a/fixtures/ReadOnlyClass.php b/fixtures/ReadOnlyClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Fixtures\Prophecy;
+
+readonly class ReadOnlyClass
+{
+}
diff --git a/spec/Prophecy/Argument/ArgumentsWildcardSpec.php b/spec/Prophecy/Argument/ArgumentsWildcardSpec.php
@@ -12,12 +12,12 @@ function it_wraps_non_token_arguments_into_ExactValueToken(\stdClass $object)
         $this->beConstructedWith(array(42, 'zet', $object));
 
         $class = get_class($object->getWrappedObject());
-        $hash  = spl_object_hash($object->getWrappedObject());
+        $id  = spl_object_id($object->getWrappedObject());
 
-        $objHash = "exact(42), exact(\"zet\"), exact($class:$hash Object (\n    'objectProphecyClosure' => Closure:%s Object (\n        0 => Closure:%s Object\n    )\n))";
+        $objHash = "exact(42), exact(\"zet\"), exact($class#$id Object (\n    'objectProphecyClosure' => Closure#%s Object (\n        0 => Closure#%s Object\n    )\n))";
 
-        $hashRegexExpr = '[a-f0-9]{32}';
-        $this->__toString()->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $hashRegexExpr, $hashRegexExpr)));
+        $idRegexExpr = '[0-9]+';
+        $this->__toString()->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $idRegexExpr, $idRegexExpr)));
     }
 
     function it_generates_string_representation_from_all_tokens_imploded(

diff --git a/spec/Prophecy/Argument/Token/ExactValueTokenSpec.php b/spec/Prophecy/Argument/Token/ExactValueTokenSpec.php
@@ -133,15 +133,15 @@ function it_generates_proper_string_representation_for_resource()
 
     function it_generates_proper_string_representation_for_object(\stdClass $object)
     {
-        $objHash = sprintf('exact(%s:%s',
+        $objHash = sprintf('exact(%s#%s',
             get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        ) . " Object (\n    'objectProphecyClosure' => Closure:%s Object (\n        0 => Closure:%s Object\n    )\n))";
+            spl_object_id($object->getWrappedObject())
+        ) . " Object (\n    'objectProphecyClosure' => Closure#%s Object (\n        0 => Closure#%s Object\n    )\n))";
 
         $this->beConstructedWith($object);
 
-        $hashRegexExpr = '[a-f0-9]{32}';
-        $this->__toString()->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $hashRegexExpr, $hashRegexExpr)));
+        $idRegexExpr = '[0-9]+';
+        $this->__toString()->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $idRegexExpr, $idRegexExpr)));
     }
 }
 

diff --git a/spec/Prophecy/Argument/Token/IdenticalValueTokenSpec.php b/spec/Prophecy/Argument/Token/IdenticalValueTokenSpec.php
@@ -141,14 +141,14 @@ function it_generates_proper_string_representation_for_resource()
 
     function it_generates_proper_string_representation_for_object($object)
     {
-        $objHash = sprintf('identical(%s:%s',
+        $objHash = sprintf('identical(%s#%s',
             get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        ) . " Object (\n    'objectProphecyClosure' => Closure:%s Object (\n        0 => Closure:%s Object\n    )\n))";
+            spl_object_id($object->getWrappedObject())
+        ) . " Object (\n    'objectProphecyClosure' => Closure#%s Object (\n        0 => Closure#%s Object\n    )\n))";
 
         $this->beConstructedWith($object);
 
-        $hashRegexExpr = '[a-f0-9]{32}';
-        $this->__toString()->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $hashRegexExpr, $hashRegexExpr)));
+        $idRegexExpr = '[0-9]+';
+        $this->__toString()->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $idRegexExpr, $idRegexExpr)));
     }
 }
diff --git a/spec/Prophecy/Doubler/ClassPatch/HhvmExceptionPatchSpec.php b/spec/Prophecy/Doubler/ClassPatch/HhvmExceptionPatchSpec.php
diff --git a/spec/Prophecy/Doubler/Generator/ClassCodeGeneratorSpec.php b/spec/Prophecy/Doubler/Generator/ClassCodeGeneratorSpec.php
@@ -32,6 +32,7 @@ function it_generates_proper_php_code_for_specific_ClassNode(
         ));
         $class->getProperties()->willReturn(array('name' => 'public', 'email' => 'private'));
         $class->getMethods()->willReturn(array($method1, $method2, $method3, $method4, $method5));
+        $class->isReadOnly()->willReturn(false);
 
         $method1->getName()->willReturn('getName');
         $method1->getVisibility()->willReturn('public');
@@ -156,6 +157,7 @@ function it_generates_proper_php_code_for_variadics(
         $class->getMethods()->willReturn(array(
             $method1, $method2, $method3, $method4
         ));
+        $class->isReadOnly()->willReturn(false);
 
         $method1->getName()->willReturn('variadic');
         $method1->getVisibility()->willReturn('public');
@@ -248,6 +250,7 @@ function it_overrides_properly_methods_with_args_passed_by_reference(
         $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
         $class->getProperties()->willReturn(array());
         $class->getMethods()->willReturn(array($method));
+        $class->isReadOnly()->willReturn(false);
 
         $method->getName()->willReturn('getName');
         $method->getVisibility()->willReturn('public');
@@ -290,6 +293,7 @@ function it_generates_proper_code_for_union_return_types
         $class->getInterfaces()->willReturn([]);
         $class->getProperties()->willReturn([]);
         $class->getMethods()->willReturn(array($method));
+        $class->isReadOnly()->willReturn(false);
 
         $method->getName()->willReturn('foo');
         $method->getVisibility()->willReturn('public');
@@ -328,6 +332,7 @@ function it_generates_proper_code_for_union_argument_types
         $class->getInterfaces()->willReturn([]);
         $class->getProperties()->willReturn([]);
         $class->getMethods()->willReturn(array($method));
+        $class->isReadOnly()->willReturn(false);
 
         $method->getName()->willReturn('foo');
         $method->getVisibility()->willReturn('public');
@@ -367,6 +372,7 @@ function it_generates_empty_class_for_empty_ClassNode(ClassNode $class)
         $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
         $class->getProperties()->willReturn(array());
         $class->getMethods()->willReturn(array());
+        $class->isReadOnly()->willReturn(false);
 
         $code = $this->generate('CustomClass', $class);
         $expected =<<<'PHP'
@@ -387,13 +393,35 @@ function it_wraps_class_in_namespace_if_it_is_namespaced(ClassNode $class)
         $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
         $class->getProperties()->willReturn(array());
         $class->getMethods()->willReturn(array());
+        $class->isReadOnly()->willReturn(false);
 
         $code = $this->generate('My\Awesome\CustomClass', $class);
         $expected =<<<'PHP'
 namespace My\Awesome {
 class CustomClass extends \stdClass implements \Prophecy\Doubler\Generator\MirroredInterface {
 
 
+}
+}
+PHP;
+        $expected = strtr($expected, array("\r\n" => "\n", "\r" => "\n"));
+        $code->shouldBe($expected);
+    }
+
+    function it_generates_read_only_class_if_parent_class_is_read_only(ClassNode $class)
+    {
+        $class->getParentClass()->willReturn('ReadOnlyClass');
+        $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
+        $class->getProperties()->willReturn(array());
+        $class->getMethods()->willReturn(array());
+        $class->isReadOnly()->willReturn(true);
+
+        $code = $this->generate('CustomClass', $class);
+        $expected =<<<'PHP'
+namespace  {
+readonly class CustomClass extends \ReadOnlyClass implements \Prophecy\Doubler\Generator\MirroredInterface {
+
+
 }
 }
 PHP;

diff --git a/spec/Prophecy/Doubler/Generator/Node/ClassNodeSpec.php b/spec/Prophecy/Doubler/Generator/Node/ClassNodeSpec.php
@@ -182,4 +182,16 @@ function it_throws_an_exception_when_adding_a_method_that_isnt_extendable(Method
         );
         $this->shouldThrow($expectedException)->duringAddMethod($method);
     }
+
+    function it_is_non_read_only_by_default()
+    {
+        $this->isReadOnly()->shouldReturn(false);
+    }
+
+    function its_read_only_is_mutable()
+    {
+        $this->setReadOnly(true);
+
+        $this->isReadOnly()->shouldReturn(true);
+    }
 }
diff --git a/spec/Prophecy/Util/StringUtilSpec.php b/spec/Prophecy/Util/StringUtilSpec.php
@@ -71,20 +71,20 @@ function it_generates_proper_string_representation_for_resource()
 
     function it_generates_proper_string_representation_for_object(\stdClass $object)
     {
-        $objHash = sprintf('%s:%s',
+        $objHash = sprintf('%s#%s',
             get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        ) . " Object (\n    'objectProphecyClosure' => Closure:%s Object (\n        0 => Closure:%s Object\n    )\n)";
+            spl_object_id($object->getWrappedObject())
+        ) . " Object (\n    'objectProphecyClosure' => Closure#%s Object (\n        0 => Closure#%s Object\n    )\n)";
 
-        $hashRegexExpr = '[a-f0-9]{32}';
-        $this->stringify($object)->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $hashRegexExpr, $hashRegexExpr)));
+        $idRegexExpr = '[0-9]+';
+        $this->stringify($object)->shouldMatch(sprintf('/^%s$/', sprintf(preg_quote("$objHash"), $idRegexExpr, $idRegexExpr)));
     }
 
     function it_generates_proper_string_representation_for_object_without_exporting(\stdClass $object)
     {
-        $objHash = sprintf('%s:%s',
+        $objHash = sprintf('%s#%s',
             get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
+            spl_object_id($object->getWrappedObject())
         );
 
         $this->stringify($object, false)->shouldReturn("$objHash");

diff --git a/src/Prophecy/Doubler/ClassPatch/HhvmExceptionPatch.php b/src/Prophecy/Doubler/ClassPatch/HhvmExceptionPatch.php
diff --git a/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php b/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php
@@ -40,8 +40,11 @@ public function generate($classname, Node\ClassNode $class)
         $classname = array_pop($parts);
         $namespace = implode('\\', $parts);
 
-        $code = sprintf("class %s extends \%s implements %s {\n",
-            $classname, $class->getParentClass(), implode(', ',
+        $code = sprintf("%sclass %s extends \%s implements %s {\n",
+            $class->isReadOnly() ? 'readonly ': '',
+            $classname,
+            $class->getParentClass(),
+            implode(', ',
                 array_map(function ($interface) {return '\\'.$interface;}, $class->getInterfaces())
             )
         );

diff --git a/src/Prophecy/Doubler/Generator/ClassMirror.php b/src/Prophecy/Doubler/Generator/ClassMirror.php
@@ -98,6 +98,10 @@ private function reflectClassToNode(ReflectionClass $class, Node\ClassNode $node
             ), $class);
         }
 
+        if (method_exists(ReflectionClass::class, 'isReadOnly')) {
+            $node->setReadOnly($class->isReadOnly());
+        }
+
         $node->setParentClass($class->getName());
 
         foreach ($class->getMethods(ReflectionMethod::IS_ABSTRACT) as $method) {
@@ -223,6 +227,13 @@ private function getTypeHints(?ReflectionType $type, ?ReflectionClass $class, bo
         }
         elseif ($type instanceof ReflectionUnionType) {
             $types = $type->getTypes();
+            if (\PHP_VERSION_ID >= 80200) {
+                foreach ($types as $reflectionType) {
+                    if ($reflectionType instanceof ReflectionIntersectionType) {
+                        throw new ClassMirrorException('Doubling intersection types is not supported', $class);
+                    }
+                }
+            }
         }
         elseif ($type instanceof ReflectionIntersectionType) {
             throw new ClassMirrorException('Doubling intersection types is not supported', $class);