Replace readAttribute() and assertAttributeEquals()

assertAttributeEquals() is deprecated and will be removed in PHPUnit 9. readAttribute() is deprecated and will be removed in PHPUnit 9. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Feb 24, 2019 · 74105ab · 74105ab
1 parent 39141e7
commit 74105ab
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
@@ -60,9 +60,12 @@ protected function tearDown(): void
      */
     public function testFormDisplayContructor()
     {
+        $reflection = new ReflectionProperty(FormDisplay::class, '_jsLangStrings');
+        $reflection->setAccessible(true);
+
         $this->assertCount(
             5,
-            $this->readAttribute($this->object, '_jsLangStrings')
+            $reflection->getValue($this->object)
         );
     }
 
@@ -95,20 +98,26 @@ public function testRegisterForm()
             $_forms['pma_testform']
         );
 
+        $attrSystemPaths = $reflection->getProperty('_systemPaths');
+        $attrSystemPaths->setAccessible(true);
+
         $this->assertEquals(
             [
                 "Servers/2/test" => "Servers/1/test",
                 "Servers/2/:group:end:0" => "Servers/1/:group:end:0",
             ],
-            $this->readAttribute($this->object, '_systemPaths')
+            $attrSystemPaths->getValue($this->object)
         );
 
+        $attrTranslatedPaths = $reflection->getProperty('_translatedPaths');
+        $attrTranslatedPaths->setAccessible(true);
+
         $this->assertEquals(
             [
                 "Servers/2/test" => "Servers-2-test",
                 "Servers/2/:group:end:0" => "Servers-2-:group:end:0",
             ],
-            $this->readAttribute($this->object, '_translatedPaths')
+            $attrTranslatedPaths->getValue($this->object)
         );
     }
 

diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -837,11 +837,8 @@ public function testGetUserValue()
     public function testGetThemeUniqueValue()
     {
         $partial_sum = (
-            Assert::readAttribute($this->object, 'source_mtime') +
-            Assert::readAttribute(
-                $this->object,
-                'default_source_mtime'
-            ) +
+            $this->object->source_mtime +
+            $this->object->default_source_mtime +
             $this->object->get('user_preferences_mtime') +
             $GLOBALS['PMA_Theme']->mtime_info +
             $GLOBALS['PMA_Theme']->filesize_info

diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
@@ -143,13 +143,13 @@ public function testGetMessage()
      */
     public function testDisableWarnings()
     {
+        $reflection = new \ReflectionProperty(Header::class, '_warningsEnabled');
+        $reflection->setAccessible(true);
+
         $header = new Header();
         $header->disableWarnings();
-        $this->assertAttributeEquals(
-            false,
-            '_warningsEnabled',
-            $header
-        );
+
+        $this->assertFalse($reflection->getValue($header));
     }
 
     /**

diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
@@ -170,13 +170,12 @@ public function testGetFiles()
      */
     public function testAddFile()
     {
+        $reflection = new \ReflectionProperty(Scripts::class, '_files');
+        $reflection->setAccessible(true);
+
         // Assert empty _files property of
         // Scripts
-        $this->assertAttributeEquals(
-            [],
-            '_files',
-            $this->object
-        );
+        $this->assertEquals([], $reflection->getValue($this->object));
 
         // Add one script file
         $file = 'common.js';
@@ -189,11 +188,7 @@ public function testAddFile()
             ],
         ];
         $this->object->addFile($file);
-        $this->assertAttributeEquals(
-            $_files,
-            '_files',
-            $this->object
-        );
+        $this->assertEquals($_files, $reflection->getValue($this->object));
     }
 
     /**
@@ -203,6 +198,9 @@ public function testAddFile()
      */
     public function testAddFiles()
     {
+        $reflection = new \ReflectionProperty(Scripts::class, '_files');
+        $reflection->setAccessible(true);
+
         $filenames = [
             'common.js',
             'sql.js',
@@ -221,10 +219,6 @@ public function testAddFiles()
             ],
         ];
         $this->object->addFiles($filenames);
-        $this->assertAttributeEquals(
-            $_files,
-            '_files',
-            $this->object
-        );
+        $this->assertEquals($_files, $reflection->getValue($this->object));
     }
 }
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
@@ -64,9 +64,12 @@ protected function setUp(): void
      */
     public function testEnabled()
     {
+        $reflection = new \ReflectionProperty(Tracker::class, 'enabled');
+        $reflection->setAccessible(true);
+
         Tracker::enable();
         $this->assertTrue(
-            Assert::readAttribute('PhpMyAdmin\Tracker', 'enabled')
+            $reflection->getValue()
         );
     }