[10.x] Remove redundant 'setAccessible' methods (#47348)

bradietilley · web-flow · commit 0f0352e76c38 · 2023-06-05T07:46:42.000-05:00
* refactor: remove redundant 'setAccessible' reflection methods

* style: remove blank line
diff --git a/src/Illuminate/Console/Scheduling/ScheduleListCommand.php b/src/Illuminate/Console/Scheduling/ScheduleListCommand.php
@@ -196,9 +196,7 @@ private function formatCronExpression($expression, $spacing)
      */
     private function getClosureLocation(CallbackEvent $event)
     {
-        $callback = tap((new ReflectionClass($event))->getProperty('callback'))
-                        ->setAccessible(true)
-                        ->getValue($event);
+        $callback = (new ReflectionClass($event))->getProperty('callback')->getValue($event);
 
         if ($callback instanceof Closure) {
             $function = new ReflectionFunction($callback);
diff --git a/src/Illuminate/Console/View/Components/Component.php b/src/Illuminate/Console/View/Components/Component.php
@@ -108,8 +108,6 @@ protected function usingQuestionHelper($callable)
             ->getParentClass()
             ->getProperty('questionHelper');
 
-        $property->setAccessible(true);
-
         $currentHelper = $property->isInitialized($this->output)
             ? $property->getValue($this->output)
             : new SymfonyQuestionHelper();
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -1976,8 +1976,6 @@ protected static function registerMixin($mixin, $replace)
 
         foreach ($methods as $method) {
             if ($replace || ! static::hasGlobalMacro($method->name)) {
-                $method->setAccessible(true);
-
                 static::macro($method->name, $method->invoke($mixin));
             }
         }
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -2227,8 +2227,6 @@ protected static function getAttributeMarkedMutatorMethods($class)
 
             if ($returnType instanceof ReflectionNamedType &&
                 $returnType->getName() === Attribute::class) {
-                $method->setAccessible(true);
-
                 if (is_callable($method->invoke($instance)->get)) {
                     return true;
                 }
diff --git a/src/Illuminate/Macroable/Traits/Macroable.php b/src/Illuminate/Macroable/Traits/Macroable.php
@@ -45,7 +45,6 @@ public static function mixin($mixin, $replace = true)
 
         foreach ($methods as $method) {
             if ($replace || ! static::hasMacro($method->name)) {
-                $method->setAccessible(true);
                 static::macro($method->name, $method->invoke($mixin));
             }
         }
diff --git a/src/Illuminate/Queue/SerializesModels.php b/src/Illuminate/Queue/SerializesModels.php
@@ -27,8 +27,6 @@ public function __serialize()
                 continue;
             }
 
-            $property->setAccessible(true);
-
             if (! $property->isInitialized($this)) {
                 continue;
             }
@@ -82,8 +80,6 @@ public function __unserialize(array $values)
                 continue;
             }
 
-            $property->setAccessible(true);
-
             $property->setValue(
                 $this, $this->getRestoredPropertyValue($values[$name])
             );
@@ -98,8 +94,6 @@ public function __unserialize(array $values)
      */
     protected function getPropertyValue(ReflectionProperty $property)
     {
-        $property->setAccessible(true);
-
         return $property->getValue($this);
     }
 }
diff --git a/src/Illuminate/Testing/TestResponse.php b/src/Illuminate/Testing/TestResponse.php
@@ -1657,8 +1657,6 @@ protected function appendMessageToException($message, $exception)
     {
         $property = new ReflectionProperty($exception, 'message');
 
-        $property->setAccessible(true);
-
         $property->setValue(
             $exception,
             $exception->getMessage().PHP_EOL.PHP_EOL.$message.PHP_EOL
diff --git a/tests/Cookie/CookieTest.php b/tests/Cookie/CookieTest.php
@@ -217,7 +217,6 @@ public function getCreator()
     private function getQueuedPropertyValue(CookieJar $cookieJar)
     {
         $property = (new ReflectionObject($cookieJar))->getProperty('queued');
-        $property->setAccessible(true);
 
         return $property->getValue($cookieJar);
     }
diff --git a/tests/Database/DatabaseConnectionFactoryTest.php b/tests/Database/DatabaseConnectionFactoryTest.php
@@ -90,9 +90,7 @@ public function testSingleConnectionNotCreatedUntilNeeded()
     {
         $connection = $this->db->getConnection();
         $pdo = new ReflectionProperty(get_class($connection), 'pdo');
-        $pdo->setAccessible(true);
         $readPdo = new ReflectionProperty(get_class($connection), 'readPdo');
-        $readPdo->setAccessible(true);
 
         $this->assertNotInstanceOf(PDO::class, $pdo->getValue($connection));
         $this->assertNotInstanceOf(PDO::class, $readPdo->getValue($connection));
@@ -102,9 +100,7 @@ public function testReadWriteConnectionsNotCreatedUntilNeeded()
     {
         $connection = $this->db->getConnection('read_write');
         $pdo = new ReflectionProperty(get_class($connection), 'pdo');
-        $pdo->setAccessible(true);
         $readPdo = new ReflectionProperty(get_class($connection), 'readPdo');
-        $readPdo->setAccessible(true);
 
         $this->assertNotInstanceOf(PDO::class, $pdo->getValue($connection));
         $this->assertNotInstanceOf(PDO::class, $readPdo->getValue($connection));
diff --git a/tests/Database/DatabaseConnectionTest.php b/tests/Database/DatabaseConnectionTest.php
@@ -412,7 +412,6 @@ public function testOnLostConnectionPDOIsSwappedOutsideTransaction()
     public function testRunMethodRetriesOnFailure()
     {
         $method = (new ReflectionClass(Connection::class))->getMethod('run');
-        $method->setAccessible(true);
 
         $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
         $mock = $this->getMockConnection(['tryAgainIfCausedByLostConnection'], $pdo);
@@ -429,7 +428,6 @@ public function testRunMethodNeverRetriesIfWithinTransaction()
         $this->expectExceptionMessage('(Connection: conn, SQL: ) (Connection: , SQL: )');
 
         $method = (new ReflectionClass(Connection::class))->getMethod('run');
-        $method->setAccessible(true);
 
         $pdo = $this->getMockBuilder(DatabaseConnectionTestMockPDO::class)->onlyMethods(['beginTransaction'])->getMock();
         $mock = $this->getMockConnection(['tryAgainIfCausedByLostConnection'], $pdo);
diff --git a/tests/Database/DatabaseEloquentFactoryTest.php b/tests/Database/DatabaseEloquentFactoryTest.php
@@ -497,7 +497,6 @@ public function test_counted_sequence()
 
         $class = new ReflectionClass($factory);
         $prop = $class->getProperty('count');
-        $prop->setAccessible(true);
         $value = $prop->getValue($factory);
 
         $this->assertSame(3, $value);
diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php
@@ -1159,7 +1159,6 @@ public function testGetArrayableRelationsFunctionExcludeHiddenRelationships()
 
         $class = new ReflectionClass($model);
         $method = $class->getMethod('getArrayableRelations');
-        $method->setAccessible(true);
 
         $model->setRelation('foo', ['bar']);
         $model->setRelation('bam', ['boom']);
diff --git a/tests/Database/DatabaseMySqlSchemaStateTest.php b/tests/Database/DatabaseMySqlSchemaStateTest.php
@@ -22,13 +22,13 @@ public function testConnectionString(string $expectedConnectionString, array $ex
 
         // test connectionString
         $method = new ReflectionMethod(get_class($schemaState), 'connectionString');
-        $connString = tap($method)->setAccessible(true)->invoke($schemaState);
+        $connString = $method->invoke($schemaState);
 
         self::assertEquals($expectedConnectionString, $connString);
 
         // test baseVariables
         $method = new ReflectionMethod(get_class($schemaState), 'baseVariables');
-        $variables = tap($method)->setAccessible(true)->invoke($schemaState, $dbConfig);
+        $variables = $method->invoke($schemaState, $dbConfig);
 
         self::assertEquals($expectedVariables, $variables);
     }
diff --git a/tests/Foundation/Bootstrap/HandleExceptionsTest.php b/tests/Foundation/Bootstrap/HandleExceptionsTest.php
@@ -31,7 +31,7 @@ protected function setUp(): void
         $this->handleExceptions = new HandleExceptions();
 
         with(new ReflectionClass($this->handleExceptions), function ($reflection) {
-            $property = tap($reflection->getProperty('app'))->setAccessible(true);
+            $property = $reflection->getProperty('app');
 
             $property->setValue(
                 $this->handleExceptions,
@@ -324,7 +324,7 @@ public function testIgnoreDeprecationIfLoggerUnresolvable()
     public function testForgetApp()
     {
         $appResolver = fn () => with(new ReflectionClass($this->handleExceptions), function ($reflection) {
-            $property = tap($reflection->getProperty('app'))->setAccessible(true);
+            $property = $reflection->getProperty('app');
 
             return $property->getValue($this->handleExceptions);
         });
@@ -339,7 +339,7 @@ public function testForgetApp()
     public function testHandlerForgetsPreviousApp()
     {
         $appResolver = fn () => with(new ReflectionClass($this->handleExceptions), function ($reflection) {
-            $property = tap($reflection->getProperty('app'))->setAccessible(true);
+            $property = $reflection->getProperty('app');
 
             return $property->getValue($this->handleExceptions);
         });
diff --git a/tests/Foundation/Console/CliDumperTest.php b/tests/Foundation/Console/CliDumperTest.php
@@ -121,7 +121,6 @@ public function testWhenIsFileViewIsNotViewCompiled()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('isCompiledViewFile');
-        $method->setAccessible(true);
         $isCompiledViewFile = $method->invoke($dumper, $file);
 
         $this->assertFalse($isCompiledViewFile);
@@ -140,7 +139,6 @@ public function testWhenIsFileViewIsViewCompiled()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('isCompiledViewFile');
-        $method->setAccessible(true);
         $isCompiledViewFile = $method->invoke($dumper, $file);
 
         $this->assertTrue($isCompiledViewFile);
@@ -160,7 +158,6 @@ public function testGetOriginalViewCompiledFile()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('getOriginalFileForCompiledView');
-        $method->setAccessible(true);
 
         $this->assertSame($original, $method->invoke($dumper, $compiled));
     }
@@ -179,7 +176,6 @@ public function testWhenGetOriginalViewCompiledFileFails()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('getOriginalFileForCompiledView');
-        $method->setAccessible(true);
 
         $this->assertSame($original, $method->invoke($dumper, $compiled));
     }
diff --git a/tests/Foundation/Http/HtmlDumperTest.php b/tests/Foundation/Http/HtmlDumperTest.php
@@ -116,7 +116,6 @@ public function testWhenIsFileViewIsNotViewCompiled()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('isCompiledViewFile');
-        $method->setAccessible(true);
         $isCompiledViewFile = $method->invoke($dumper, $file);
 
         $this->assertFalse($isCompiledViewFile);
@@ -133,7 +132,6 @@ public function testWhenIsFileViewIsViewCompiled()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('isCompiledViewFile');
-        $method->setAccessible(true);
         $isCompiledViewFile = $method->invoke($dumper, $file);
 
         $this->assertTrue($isCompiledViewFile);
@@ -151,7 +149,6 @@ public function testGetOriginalViewCompiledFile()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('getOriginalFileForCompiledView');
-        $method->setAccessible(true);
 
         $this->assertSame($original, $method->invoke($dumper, $compiled));
     }
@@ -168,7 +165,6 @@ public function testWhenGetOriginalViewCompiledFileFails()
 
         $reflection = new ReflectionClass($dumper);
         $method = $reflection->getMethod('getOriginalFileForCompiledView');
-        $method->setAccessible(true);
 
         $this->assertSame($original, $method->invoke($dumper, $compiled));
     }
diff --git a/tests/Foundation/Testing/BootTraitsTest.php b/tests/Foundation/Testing/BootTraitsTest.php
@@ -36,12 +36,12 @@ public function testSetUpAndTearDownTraits()
         $testCase = new TestCaseWithTrait('foo');
 
         $method = new ReflectionMethod($testCase, 'setUpTraits');
-        tap($method)->setAccessible(true)->invoke($testCase);
+        $method->invoke($testCase);
 
         $this->assertTrue($testCase->setUp);
 
         $method = new ReflectionMethod($testCase, 'callBeforeApplicationDestroyedCallbacks');
-        tap($method)->setAccessible(true)->invoke($testCase);
+        $method->invoke($testCase);
 
         $this->assertTrue($testCase->tearDown);
     }
diff --git a/tests/Foundation/Testing/DatabaseMigrationsTest.php b/tests/Foundation/Testing/DatabaseMigrationsTest.php
@@ -38,8 +38,6 @@ private function __reflectAndSetupAccessibleForProtectedTraitMethod($methodName)
             $methodName
         );
 
-        $migrateFreshUsingReflection->setAccessible(true);
-
         return $migrateFreshUsingReflection;
     }
 
diff --git a/tests/Foundation/Testing/RefreshDatabaseTest.php b/tests/Foundation/Testing/RefreshDatabaseTest.php
@@ -38,8 +38,6 @@ private function __reflectAndSetupAccessibleForProtectedTraitMethod($methodName)
             $methodName
         );
 
-        $migrateFreshUsingReflection->setAccessible(true);
-
         return $migrateFreshUsingReflection;
     }
 
diff --git a/tests/Foundation/Testing/Traits/CanConfigureMigrationCommandsTest.php b/tests/Foundation/Testing/Traits/CanConfigureMigrationCommandsTest.php
@@ -22,8 +22,6 @@ private function __reflectAndSetupAccessibleForProtectedTraitMethod($methodName)
             $methodName
         );
 
-        $migrateFreshUsingReflection->setAccessible(true);
-
         return $migrateFreshUsingReflection;
     }
 
diff --git a/tests/Integration/Queue/JobDispatchingTest.php b/tests/Integration/Queue/JobDispatchingTest.php
@@ -78,7 +78,6 @@ public function testUniqueJobLockIsReleasedForJobDispatchedAfterResponse()
     {
         // get initial terminatingCallbacks
         $terminatingCallbacksReflectionProperty = (new \ReflectionObject($this->app))->getProperty('terminatingCallbacks');
-        $terminatingCallbacksReflectionProperty->setAccessible(true);
         $startTerminatingCallbacks = $terminatingCallbacksReflectionProperty->getValue($this->app);
 
         UniqueJob::dispatchAfterResponse('test');
diff --git a/tests/Log/LogManagerTest.php b/tests/Log/LogManagerTest.php
diff --git a/tests/Mail/MailableAlternativeSyntaxTest.php b/tests/Mail/MailableAlternativeSyntaxTest.php
diff --git a/tests/Queue/QueueDatabaseQueueUnitTest.php b/tests/Queue/QueueDatabaseQueueUnitTest.php
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
diff --git a/tests/Support/SupportFluentTest.php b/tests/Support/SupportFluentTest.php
diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
diff --git a/tests/Testing/Concerns/TestDatabasesTest.php b/tests/Testing/Concerns/TestDatabasesTest.php

Original file line number	Diff line number	Diff line change
`@@ -1976,8 +1976,6 @@ protected static function registerMixin($mixin, $replace)`
`1976`	`1976`
`1977`	`1977`	`foreach ($methods as $method) {`
`1978`	`1978`	`if ($replace \|\| ! static::hasGlobalMacro($method->name)) {`
`1979`		`- $method->setAccessible(true);`
`1980`		`-`
`1981`	`1979`	`static::macro($method->name, $method->invoke($mixin));`
`1982`	`1980`	`}`
`1983`	`1981`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2227,8 +2227,6 @@ protected static function getAttributeMarkedMutatorMethods($class)`
`2227`	`2227`
`2228`	`2228`	`if ($returnType instanceof ReflectionNamedType &&`
`2229`	`2229`	`$returnType->getName() === Attribute::class) {`
`2230`		`- $method->setAccessible(true);`
`2231`		`-`
`2232`	`2230`	`if (is_callable($method->invoke($instance)->get)) {`
`2233`	`2231`	`return true;`
`2234`	`2232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ public static function mixin($mixin, $replace = true)`
`45`	`45`
`46`	`46`	`foreach ($methods as $method) {`
`47`	`47`	`if ($replace \|\| ! static::hasMacro($method->name)) {`
`48`		`- $method->setAccessible(true);`
`49`	`48`	`static::macro($method->name, $method->invoke($mixin));`
`50`	`49`	`}`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ public function __serialize()`
`27`	`27`	`continue;`
`28`	`28`	`}`
`29`	`29`
`30`		`- $property->setAccessible(true);`
`31`		`-`
`32`	`30`	`if (! $property->isInitialized($this)) {`
`33`	`31`	`continue;`
`34`	`32`	`}`
`@@ -82,8 +80,6 @@ public function __unserialize(array $values)`
`82`	`80`	`continue;`
`83`	`81`	`}`
`84`	`82`
`85`		`- $property->setAccessible(true);`
`86`		`-`
`87`	`83`	`$property->setValue(`
`88`	`84`	`$this, $this->getRestoredPropertyValue($values[$name])`
`89`	`85`	`);`
`@@ -98,8 +94,6 @@ public function __unserialize(array $values)`
`98`	`94`	`*/`
`99`	`95`	`protected function getPropertyValue(ReflectionProperty $property)`
`100`	`96`	`{`
`101`		`- $property->setAccessible(true);`
`102`		`-`
`103`	`97`	`return $property->getValue($this);`
`104`	`98`	`}`
`105`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1657,8 +1657,6 @@ protected function appendMessageToException($message, $exception)`
`1657`	`1657`	`{`
`1658`	`1658`	`$property = new ReflectionProperty($exception, 'message');`
`1659`	`1659`
`1660`		`- $property->setAccessible(true);`
`1661`		`-`
`1662`	`1660`	`$property->setValue(`
`1663`	`1661`	`$exception,`
`1664`	`1662`	`$exception->getMessage().PHP_EOL.PHP_EOL.$message.PHP_EOL`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ public function getCreator()`
`217`	`217`	`private function getQueuedPropertyValue(CookieJar $cookieJar)`
`218`	`218`	`{`
`219`	`219`	`$property = (new ReflectionObject($cookieJar))->getProperty('queued');`
`220`		`- $property->setAccessible(true);`
`221`	`220`
`222`	`221`	`return $property->getValue($cookieJar);`
`223`	`222`	`}`