Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit 61cf2b0999ec · 2024-02-16T14:44:10.000+01:00
* 6.4:
  fix tests
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -227,7 +227,7 @@ public function testGetValueThrowsExceptionIfUninitializedPropertyWithGetterOfAn
         $this->expectException(UninitializedPropertyException::class);
         $this->expectExceptionMessage('The method "Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty@anonymous::getUninitialized()" returned "null", but expected type "array". Did you forget to initialize a property or to make the return type nullable using "?array"?');
 
-        $object = new class() extends \Symfony\Component\PropertyAccess\Tests\Fixtures\UninitializedPrivateProperty {
+        $object = new class() extends UninitializedPrivateProperty {
         };
 
         $this->propertyAccessor->getValue($object, 'uninitialized');
@@ -978,20 +978,6 @@ public function testGetValueGetterThrowsExceptionIfUninitializedWithoutLazyGhost
         $this->propertyAccessor->getValue(new UninitializedObjectProperty(), 'privateUninitialized');
     }
 
-    private function createUninitializedObjectPropertyGhost(): UninitializedObjectProperty
-    {
-        $class = 'UninitializedObjectPropertyGhost';
-
-        if (!class_exists($class)) {
-            eval('class '.$class.ProxyHelper::generateLazyGhost(new \ReflectionClass(UninitializedObjectProperty::class)));
-        }
-
-        $this->assertTrue(class_exists($class));
-
-        return $class::createLazyGhost(initializer: function ($instance) {
-        });
-    }
-
     public function testGetValuePropertyThrowsExceptionIfUninitializedWithLazyGhost()
     {
         $this->expectException(UninitializedPropertyException::class);
@@ -1011,4 +997,22 @@ public function testGetValueGetterThrowsExceptionIfUninitializedWithLazyGhost()
 
         $this->propertyAccessor->getValue($lazyGhost, 'privateUninitialized');
     }
+
+    private function createUninitializedObjectPropertyGhost(): UninitializedObjectProperty
+    {
+        if (!class_exists(ProxyHelper::class)) {
+            $this->markTestSkipped(sprintf('Class "%s" is required to run this test.', ProxyHelper::class));
+        }
+
+        $class = 'UninitializedObjectPropertyGhost';
+
+        if (!class_exists($class)) {
+            eval('class '.$class.ProxyHelper::generateLazyGhost(new \ReflectionClass(UninitializedObjectProperty::class)));
+        }
+
+        $this->assertTrue(class_exists($class));
+
+        return $class::createLazyGhost(initializer: function ($instance) {
+        });
+    }
 }
