Remove Reflection's setAccessible() method

This method is no-op since PHP 8.1. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 21, 2023 · cb67fa3 · cb67fa3
1 parent f2bdca0
commit cb67fa3
Show file tree

Hide file tree

Showing 38 changed files with 0 additions and 321 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
diff --git a/test/classes/AbstractNetworkTestCase.php b/test/classes/AbstractNetworkTestCase.php
@@ -87,7 +87,6 @@ public function mockResponse(...$param): MockObject
         }
 
         $attrInstance = new ReflectionProperty(ResponseRenderer::class, 'instance');
-        $attrInstance->setAccessible(true);
         $attrInstance->setValue($mockResponse);
 
         return $mockResponse;
@@ -100,8 +99,6 @@ protected function tearDown(): void
     {
         parent::tearDown();
         $response = new ReflectionProperty(ResponseRenderer::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue(null);
-        $response->setAccessible(false);
     }
 }
diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -226,7 +226,6 @@ protected function callFunction($object, string $className, string $methodName,
     {
         $class = new ReflectionClass($className);
         $method = $class->getMethod($methodName);
-        $method->setAccessible(true);
 
         return $method->invokeArgs($object, $params);
     }

diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
@@ -55,7 +55,6 @@ public function testRegisterForm(): void
         $reflection = new ReflectionClass(FormDisplay::class);
 
         $attrForms = $reflection->getProperty('forms');
-        $attrForms->setAccessible(true);
 
         $array = [
             'Servers' => [
@@ -71,7 +70,6 @@ public function testRegisterForm(): void
         $this->assertInstanceOf(Form::class, $_forms['pma_testform']);
 
         $attrSystemPaths = $reflection->getProperty('systemPaths');
-        $attrSystemPaths->setAccessible(true);
 
         $this->assertEquals(
             [
@@ -82,7 +80,6 @@ public function testRegisterForm(): void
         );
 
         $attrTranslatedPaths = $reflection->getProperty('translatedPaths');
-        $attrTranslatedPaths->setAccessible(true);
 
         $this->assertEquals(
             [
@@ -110,7 +107,6 @@ public function testProcess(): void
             ->getMock();
 
         $attrForms = new ReflectionProperty(FormDisplay::class, 'forms');
-        $attrForms->setAccessible(true);
         $attrForms->setValue($this->object, [1, 2, 3]);
 
         $this->object->expects($this->once())
@@ -137,11 +133,9 @@ public function testDisplayErrors(): void
         $reflection = new ReflectionClass(FormDisplay::class);
 
         $attrIsValidated = $reflection->getProperty('isValidated');
-        $attrIsValidated->setAccessible(true);
         $attrIsValidated->setValue($this->object, true);
 
         $attrIsValidated = $reflection->getProperty('errors');
-        $attrIsValidated->setAccessible(true);
         $attrIsValidated->setValue($this->object, []);
 
         $result = $this->object->displayErrors();
@@ -159,7 +153,6 @@ public function testDisplayErrors(): void
         $sysArr = ['Servers/1/test' => 'Servers/1/test2'];
 
         $attrSystemPaths = $reflection->getProperty('systemPaths');
-        $attrSystemPaths->setAccessible(true);
         $attrSystemPaths->setValue($this->object, $sysArr);
 
         $attrIsValidated->setValue($this->object, $arr);
@@ -181,11 +174,9 @@ public function testFixErrors(): void
         $reflection = new ReflectionClass(FormDisplay::class);
 
         $attrIsValidated = $reflection->getProperty('isValidated');
-        $attrIsValidated->setAccessible(true);
         $attrIsValidated->setValue($this->object, true);
 
         $attrIsValidated = $reflection->getProperty('errors');
-        $attrIsValidated->setAccessible(true);
         $attrIsValidated->setValue($this->object, []);
 
         $this->object->fixErrors();
@@ -202,7 +193,6 @@ public function testFixErrors(): void
         $sysArr = ['Servers/1/test' => 'Servers/1/host'];
 
         $attrSystemPaths = $reflection->getProperty('systemPaths');
-        $attrSystemPaths->setAccessible(true);
         $attrSystemPaths->setValue($this->object, $sysArr);
 
         $attrIsValidated->setValue($this->object, $arr);
@@ -225,7 +215,6 @@ public function testFixErrors(): void
     public function testValidateSelect(): void
     {
         $attrValidateSelect = new ReflectionMethod(FormDisplay::class, 'validateSelect');
-        $attrValidateSelect->setAccessible(true);
 
         $arr = ['foo' => 'var'];
         $value = 'foo';
@@ -286,7 +275,6 @@ public function testValidateSelect(): void
     public function testHasErrors(): void
     {
         $attrErrors = new ReflectionProperty(FormDisplay::class, 'errors');
-        $attrErrors->setAccessible(true);
 
         $this->assertFalse(
             $this->object->hasErrors()
@@ -333,7 +321,6 @@ public function testGetDocLink(): void
     public function testGetOptName(): void
     {
         $method = new ReflectionMethod(FormDisplay::class, 'getOptName');
-        $method->setAccessible(true);
 
         $this->assertEquals(
             'Servers_',
@@ -352,11 +339,9 @@ public function testGetOptName(): void
     public function testLoadUserprefsInfo(): void
     {
         $method = new ReflectionMethod(FormDisplay::class, 'loadUserprefsInfo');
-        $method->setAccessible(true);
 
         $attrUserprefs = new ReflectionProperty(FormDisplay::class, 'userprefsDisallow');
 
-        $attrUserprefs->setAccessible(true);
         $method->invoke($this->object, null);
         $this->assertEquals(
             [],
@@ -370,7 +355,6 @@ public function testLoadUserprefsInfo(): void
     public function testSetComments(): void
     {
         $method = new ReflectionMethod(FormDisplay::class, 'setComments');
-        $method->setAccessible(true);
 
         // recoding
         $opts = ['values' => []];

diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
@@ -68,7 +68,6 @@ public function testContructor(): void
     public function testGetOptionType(): void
     {
         $attrFieldsTypes = new ReflectionProperty(Form::class, 'fieldsTypes');
-        $attrFieldsTypes->setAccessible(true);
         $attrFieldsTypes->setValue(
             $this->object,
             ['7' => 'Seven']
@@ -124,7 +123,6 @@ public function testReadFormPathsCallBack(): void
     {
         $reflection = new ReflectionClass(Form::class);
         $method = $reflection->getMethod('readFormPathsCallback');
-        $method->setAccessible(true);
 
         $array = [
             'foo' => [
@@ -160,7 +158,6 @@ public function testReadFormPaths(): void
     {
         $reflection = new ReflectionClass(Form::class);
         $method = $reflection->getMethod('readFormPaths');
-        $method->setAccessible(true);
 
         $array = [
             'foo' => [
@@ -200,7 +197,6 @@ public function testReadTypes(): void
     {
         $reflection = new ReflectionClass(Form::class);
         $method = $reflection->getMethod('readTypes');
-        $method->setAccessible(true);
 
         $this->object->fields = [
             'pma_form1' => 'Servers/1/port',
@@ -210,7 +206,6 @@ public function testReadTypes(): void
         ];
 
         $attrFieldsTypes = $reflection->getProperty('fieldsTypes');
-        $attrFieldsTypes->setAccessible(true);
 
         $method->invoke($this->object, null);
 

diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php
@@ -39,7 +39,6 @@ protected function setUp(): void
         $GLOBALS['ConfigFile'] = $cf;
 
         $reflection = new ReflectionProperty(ConfigFile::class, 'id');
-        $reflection->setAccessible(true);
         $this->sessionID = $reflection->getValue($cf);
 
         unset($_SESSION['messages']);

diff --git a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
@@ -51,7 +51,6 @@ public function testSynchronizeFavoriteTables(): void
 
         $class = new ReflectionClass(FavoriteTableController::class);
         $method = $class->getMethod('synchronizeFavoriteTables');
-        $method->setAccessible(true);
 
         $controller = new FavoriteTableController(
             new ResponseStub(),

diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -77,7 +77,6 @@ public function testGetValuesForInnodbTable(): void
     {
         $class = new ReflectionClass(StructureController::class);
         $method = $class->getMethod('getValuesForInnodbTable');
-        $method->setAccessible(true);
         $controller = new StructureController(
             $this->response,
             $this->template,
@@ -87,7 +86,6 @@ public function testGetValuesForInnodbTable(): void
         );
         // Showing statistics
         $property = $class->getProperty('isShowStats');
-        $property->setAccessible(true);
         $property->setValue($controller, true);
 
         $GLOBALS['cfg']['MaxExactCount'] = 10;
@@ -148,7 +146,6 @@ public function testGetValuesForAriaTable(): void
     {
         $class = new ReflectionClass(StructureController::class);
         $method = $class->getMethod('getValuesForAriaTable');
-        $method->setAccessible(true);
 
         $controller = new StructureController(
             $this->response,
@@ -159,10 +156,8 @@ public function testGetValuesForAriaTable(): void
         );
         // Showing statistics
         $property = $class->getProperty('isShowStats');
-        $property->setAccessible(true);
         $property->setValue($controller, true);
         $property = $class->getProperty('dbIsSystemSchema');
-        $property->setAccessible(true);
         $property->setValue($controller, true);
 
         $currentTable = [
@@ -252,7 +247,6 @@ public function testHasTable(): void
     {
         $class = new ReflectionClass(StructureController::class);
         $method = $class->getMethod('hasTable');
-        $method->setAccessible(true);
 
         $controller = new StructureController(
             $this->response,
@@ -287,7 +281,6 @@ public function testCheckFavoriteTable(): void
     {
         $class = new ReflectionClass(StructureController::class);
         $method = $class->getMethod('checkFavoriteTable');
-        $method->setAccessible(true);
 
         $controller = new StructureController(
             $this->response,
@@ -320,7 +313,6 @@ public function testDisplayTableList(): void
     {
         $class = new ReflectionClass(StructureController::class);
         $method = $class->getMethod('displayTableList');
-        $method->setAccessible(true);
 
         $controller = new StructureController(
             $this->response,
@@ -332,14 +324,11 @@ public function testDisplayTableList(): void
         // Showing statistics
         $class = new ReflectionClass(StructureController::class);
         $showStatsProperty = $class->getProperty('isShowStats');
-        $showStatsProperty->setAccessible(true);
         $showStatsProperty->setValue($controller, true);
 
         $tablesProperty = $class->getProperty('tables');
-        $tablesProperty->setAccessible(true);
 
         $numTables = $class->getProperty('numTables');
-        $numTables->setAccessible(true);
         $numTables->setValue($controller, 1);
 
         //no tables

diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php
@@ -154,7 +154,6 @@ public function testFormatVariable(): void
             ->willReturnOnConsecutiveCalls('byte', 'string');
 
         $response = new ReflectionProperty(ServerVariablesProvider::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue($voidProviderMock);
 
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
@@ -206,7 +205,6 @@ public function testFormatVariableMariaDbMySqlKbs(): void
         }
 
         $response = new ReflectionProperty(ServerVariablesProvider::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue(null);
 
         $controller = new VariablesController(ResponseRenderer::getInstance(), new Template(), $GLOBALS['dbi']);
@@ -265,7 +263,6 @@ public function testFormatVariableMariaDbMySqlKbs(): void
     public function testFormatVariableVoidProvider(): void
     {
         $response = new ReflectionProperty(ServerVariablesProvider::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue(new ServerVariablesVoidProvider());
 
         $controller = new VariablesController(ResponseRenderer::getInstance(), new Template(), $GLOBALS['dbi']);

diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -102,7 +102,6 @@ public function testDisplayFormAction(): void
         $template = new Template();
 
         $method = new ReflectionMethod(IndexesController::class, 'displayForm');
-        $method->setAccessible(true);
 
         $ctrl = new IndexesController(
             $response,

diff --git a/test/classes/Controllers/Table/Structure/ChangeControllerTest.php b/test/classes/Controllers/Table/Structure/ChangeControllerTest.php
@@ -48,7 +48,6 @@ public function testChangeController(): void
 
         $class = new ReflectionClass(ChangeController::class);
         $method = $class->getMethod('displayHtmlForColumnChange');
-        $method->setAccessible(true);
 
         $ctrl = new ChangeController(
             $response,

diff --git a/test/classes/Controllers/Table/Structure/SaveControllerTest.php b/test/classes/Controllers/Table/Structure/SaveControllerTest.php
@@ -112,7 +112,6 @@ public function testAdjustColumnPrivileges(): void
 
         $class = new ReflectionClass(SaveController::class);
         $method = $class->getMethod('adjustColumnPrivileges');
-        $method->setAccessible(true);
 
         $ctrl = new SaveController(
             new ResponseRenderer(),

diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
@@ -106,7 +106,6 @@ public function testGetPageIdsAndNames(): void
         $this->designer = new Designer($GLOBALS['dbi'], new Relation($GLOBALS['dbi']), new Template());
 
         $method = new ReflectionMethod(Designer::class, 'getPageIdsAndNames');
-        $method->setAccessible(true);
         $result = $method->invokeArgs($this->designer, [$db]);
 
         $this->assertEquals(

diff --git a/test/classes/Gis/GisGeomTestCase.php b/test/classes/Gis/GisGeomTestCase.php
@@ -102,7 +102,6 @@ protected static function createEmptyPdf(string $id): TCPDF
     {
         $pdf = new TCPDF();
         $prop = new ReflectionProperty($pdf, 'file_id');
-        $prop->setAccessible(true);
         $prop->setValue($pdf, md5($id));
         $pdf->setDocCreationTimestamp(1600000000);
         $pdf->setDocModificationTimestamp(1600000000);

diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
@@ -121,7 +121,6 @@ public function testGetMessage(): void
     public function testDisableWarnings(): void
     {
         $reflection = new ReflectionProperty(Header::class, 'warningsEnabled');
-        $reflection->setAccessible(true);
 
         $header = new Header();
         $header->disableWarnings();

diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
@@ -112,9 +112,7 @@ protected function tearDown(): void
     {
         parent::tearDown();
         $response = new ReflectionProperty(ResponseRenderer::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue(null);
-        $response->setAccessible(false);
     }
 
     /**
@@ -360,7 +358,6 @@ public function testShowEmptyResultMessageOrSetUniqueCondition(): void
 
         $restoreInstance = ResponseRenderer::getInstance();
         $response = new ReflectionProperty(ResponseRenderer::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue($responseMock);
 
         $result = $this->callFunction(
@@ -2971,7 +2968,6 @@ public function testDetermineInsertOrEdit(): void
 
         $restoreInstance = ResponseRenderer::getInstance();
         $response = new ReflectionProperty(ResponseRenderer::class, 'instance');
-        $response->setAccessible(true);
         $response->setValue($responseMock);
 
         $this->insertEdit = new InsertEdit(

diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php
@@ -244,7 +244,6 @@ public function testHasSiblingsForNodesAtLevelThree(): void
     public function testGetWhereClause(): void
     {
         $method = new ReflectionMethod(Node::class, 'getWhereClause');
-        $method->setAccessible(true);
 
         // Vanilla case
         $node = new Node('default');