Merge pull request #1538 from Roave/fix/#1537-correct-reflectionproperty-setvalue-deprecation

ReflectionProperty#setValue() always requires 2 arguments

Author: Ocramius

phpunit.xml.dist

@@ -6,6 +6,7 @@
     colors="true"
     executionOrder="random"
     cacheDirectory=".phpunit.cache"
+    failOnDeprecation="true"
 >
     <source>
         <include>

src/Reflection/Adapter/ReflectionClass.php

@@ -600,7 +600,7 @@ public function setStaticPropertyValue(string $name, mixed $value): void
             throw new CoreReflectionException(sprintf('Class %s does not have a property named %s', $this->betterReflectionClass->getName(), $name));
         }
 
-        $property->setValue($value);
+        $property->setValue(null, $value);
     }
 
     /**

test/unit/Reflection/Adapter/ReflectionClassTest.php

@@ -728,7 +728,7 @@ public function testSetStaticPropertyValue(): void
         $betterReflectionProperty
             ->expects($this->once())
             ->method('setValue')
-            ->with(123);
+            ->with(null, 123);
 
         $betterReflectionClass = $this->createMock(BetterReflectionClass::class);
         $betterReflectionClass

test/unit/Reflection/Adapter/ReflectionObjectTest.php

@@ -958,7 +958,6 @@ public function testGetAttributesWithName(): void
         $betterReflectionObject           = $betterReflectionObjectReflection->newInstanceWithoutConstructor();
 
         $betterReflectionObjectClassPropertyReflection = $betterReflectionObjectReflection->getProperty('reflectionClass');
-        $betterReflectionObjectClassPropertyReflection->setAccessible(true);
         $betterReflectionObjectClassPropertyReflection->setValue($betterReflectionObject, $betterReflectionClass);
 
         $reflectionObjectAdapter = new ReflectionObjectAdapter($betterReflectionObject);
@@ -1067,7 +1066,6 @@ public function testGetAttributesWithInstance(): void
         $betterReflectionObject           = $betterReflectionObjectReflection->newInstanceWithoutConstructor();
 
         $betterReflectionObjectClassPropertyReflection = $betterReflectionObjectReflection->getProperty('reflectionClass');
-        $betterReflectionObjectClassPropertyReflection->setAccessible(true);
         $betterReflectionObjectClassPropertyReflection->setValue($betterReflectionObject, $betterReflectionClass);
 
         $reflectionObjectAdapter = new ReflectionObjectAdapter($betterReflectionObject);

test/unit/Reflection/ReflectionObjectTest.php

@@ -151,11 +151,9 @@ public function testExceptionThrownWhenInvalidInstanceGiven(): void
         $reflectionObjectReflection = new CoreReflectionObject($classInfo);
 
         $reflectionObjectObjectReflection = $reflectionObjectReflection->getProperty('object');
-        $reflectionObjectObjectReflection->setAccessible(true);
         $reflectionObjectObjectReflection->setValue($classInfo, new stdClass());
 
         $reflectionObjectReflectionClassReflection = $reflectionObjectReflection->getProperty('reflectionClass');
-        $reflectionObjectReflectionClassReflection->setAccessible(true);
         $reflectionObjectReflectionClassReflection->setValue($classInfo, $mockClass);
 
         $this->expectException(InvalidArgumentException::class);
@@ -300,7 +298,6 @@ public function testReflectionObjectOverridesAllMethodsInReflectionClass(string
 
         foreach ($properties as $propertyName => $propertyValue) {
             $mockReflectionClassNodeReflection = $mockReflectionClassReflection->getProperty($propertyName);
-            $mockReflectionClassNodeReflection->setAccessible(true);
             $mockReflectionClassNodeReflection->setValue($mockReflectionClass, $propertyValue);
         }
 
@@ -311,7 +308,6 @@ public function testReflectionObjectOverridesAllMethodsInReflectionClass(string
         // the mocked reflectionclass above
         $reflectionObjectReflection                        = new CoreReflectionObject($reflectionObject);
         $reflectionObjectReflectionClassPropertyReflection = $reflectionObjectReflection->getProperty('reflectionClass');
-        $reflectionObjectReflectionClassPropertyReflection->setAccessible(true);
         $reflectionObjectReflectionClassPropertyReflection->setValue($reflectionObject, $mockReflectionClass);
 
         $reflectionObjectReflectionMethod = $reflectionObjectReflection->getMethod($methodName);

test/unit/SourceLocator/Ast/Exception/ParseToAstFailureTest.php

@@ -172,7 +172,6 @@ public function testLocatedSourceWithFilename(): void
         $locatedSource = new LocatedSource('<?php abc', 'Whatever');
 
         $filenameProperty = new ReflectionProperty($locatedSource, 'filename');
-        $filenameProperty->setAccessible(true);
         $filenameProperty->setValue($locatedSource, '/foo/bar');
 
         $previous = new Error('Some error message', ['startLine' => 1]);
@@ -209,7 +208,6 @@ public function testUnknownError(): void
         $locatedSource = new LocatedSource('<?php abc', 'Whatever');
 
         $filenameProperty = new ReflectionProperty($locatedSource, 'filename');
-        $filenameProperty->setAccessible(true);
         $filenameProperty->setValue($locatedSource, '/foo/bar');
 
         $previous = new Exception('Unknown error');

test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php

@@ -765,20 +765,20 @@ public function testUpdateConstantValue(): void
         $stubberReflection = new CoreReflectionClass($sourceStubber);
 
         $stubDirectoryReflection = $stubberReflection->getProperty('stubsDirectory');
-        $stubDirectoryReflection->setAccessible(true);
         $stubDirectoryReflection->setValue($sourceStubber, __DIR__ . '/../../Fixture');
 
         $classMapReflection = $stubberReflection->getProperty('classMap');
-        $classMapReflection->setAccessible(true);
+
         $classMapValue                                                     = $classMapReflection->getValue();
         $classMapValue['roave\betterreflectiontest\fixture\fakeconstants'] = 'fakeconstants/FakeConstantsStub.php';
         $classMapReflection->setValue($classMapReflection, $classMapValue);
 
         $constantMapReflection = $stubberReflection->getProperty('constantMap');
-        $constantMapReflection->setAccessible(true);
+
         $constantMapValue                                                      = $constantMapReflection->getValue();
         $constantMapValue['define_constant']                                   = 'fakeconstants/FakeConstantsStub.php';
         $constantMapValue['roave\betterreflectiontest\fixture\const_constant'] = 'fakeconstants/FakeConstantsStub.php';
+
         $constantMapReflection->setValue($constantMapReflection, $constantMapValue);
 
         $classConstantStub = $sourceStubber->generateClassStub('Roave\BetterReflectionTest\Fixture\FakeConstants');

test/unit/SourceLocator/Type/AnonymousClassObjectSourceLocatorTest.php

@@ -165,7 +165,6 @@ public function testExceptionIfAnonymousClassNotFoundOnExpectedLine(): void
             ->willReturn(0);
 
         $coreReflectionPropertyInSourceLocatatorReflection = $sourceLocatorReflection->getProperty('coreClassReflection');
-        $coreReflectionPropertyInSourceLocatatorReflection->setAccessible(true);
         $coreReflectionPropertyInSourceLocatatorReflection->setValue($sourceLocator, $coreReflectionPropertyMock);
 
         $this->expectException(NoAnonymousClassOnLine::class);
@@ -262,7 +261,6 @@ public function testExceptionIfSourceFileIsNotReadable(): void
 
         $sourceLocatorReflection                            = new CoreReflectionClass($sourceLocator);
         $sourceLocatorReflectionCoreClassReflectionProperty = $sourceLocatorReflection->getProperty('coreClassReflection');
-        $sourceLocatorReflectionCoreClassReflectionProperty->setAccessible(true);
         $sourceLocatorReflectionCoreClassReflectionProperty->setValue($sourceLocator, $sourceLocatorReflectionCoreClassReflectionPropertyValue);
 
         $this->expectException(InvalidFileLocation::class);

test/unit/SourceLocator/Type/AutoloadSourceLocatorTest.php

@@ -345,7 +345,7 @@ public function testNullReturnedWhenInvalidTypeGiven(): void
         $type           = new IdentifierType();
         $typeReflection = new ReflectionObject($type);
         $prop           = $typeReflection->getProperty('name');
-        $prop->setAccessible(true);
+
         $prop->setValue($type, 'nonsense');
 
         $identifier = new Identifier('foo', $type);

test/unit/SourceLocator/Type/ClosureSourceLocatorTest.php

@@ -141,7 +141,6 @@ public function testExceptionIfClosureNotFoundOnExpectedLine(): void
             ->willReturn(0);
 
         $coreReflectionPropertyInSourceLocatatorReflection = $sourceLocatorReflection->getProperty('coreFunctionReflection');
-        $coreReflectionPropertyInSourceLocatatorReflection->setAccessible(true);
         $coreReflectionPropertyInSourceLocatatorReflection->setValue($sourceLocator, $coreReflectionPropertyMock);
 
         $this->expectException(NoClosureOnLine::class);
@@ -221,7 +220,6 @@ public function testExceptionIfSourceFileIsNotReadable(): void
 
         $sourceLocatorReflection                               = new CoreReflectionClass($sourceLocator);
         $sourceLocatorReflectionCoreFunctionReflectionProperty = $sourceLocatorReflection->getProperty('coreFunctionReflection');
-        $sourceLocatorReflectionCoreFunctionReflectionProperty->setAccessible(true);
         $sourceLocatorReflectionCoreFunctionReflectionProperty->setValue($sourceLocator, $sourceLocatorReflectionCoreFunctionReflectionPropertyValue);
 
         $this->expectException(InvalidFileLocation::class);