Merge pull request #424 from creative-commoners/pulls/5/php85

MNT Update unit tests for PHP 8.5

Author: GuySartorelli

tests/php/Controllers/LinkFieldControllerTest.php

@@ -190,7 +190,6 @@ public function testExcludeLinkTextField(bool $excludeLinkTextField): void
         $request->setSession(new Session([]));
         $controller = new LinkFieldController();
         $reflectionFindAction = new ReflectionMethod($controller, 'findAction');
-        $reflectionFindAction->setAccessible(true);
         $reflectionFindAction->invoke($controller, $request);
         $controller->setRequest($request);
         $form = $controller->linkForm();

tests/php/Form/AbstractLinkFieldTest.php

@@ -33,7 +33,6 @@ public function testElementalNamespaceRemoved(): void
         $form->loadDataFrom($block);
         $reflector = new ReflectionObject($field);
         $method = $reflector->getMethod('getOwnerFields');
-        $method->setAccessible(true);
         $res = $method->invoke($field);
         $this->assertEquals([
             'ID' => $block->ID,

tests/php/Form/MultiLinkFieldTest.php

@@ -67,7 +67,6 @@ public function testConvertValueToArray(mixed $value, array $expected): void
     {
         $field = new MultiLinkField('');
         $reflectionMethod = new ReflectionMethod($field, 'convertValueToArray');
-        $reflectionMethod->setAccessible(true);
         $this->assertSame($expected, $reflectionMethod->invoke($field, $value));
     }
 

tests/php/Models/FileLinkTest.php

@@ -40,8 +40,6 @@ public function testGetDescription(): void
     public function testGetDefaultTitle(): void
     {
         $reflectionGetDefaultTitle = new ReflectionMethod(FileLink::class, 'getDefaultTitle');
-        $reflectionGetDefaultTitle->setAccessible(true);
-
         // File does not exist
         $link = new FileLink();
         $this->assertSame('(File missing)', $reflectionGetDefaultTitle->invoke($link));

tests/php/Models/SiteTreeLinkTest.php

@@ -37,8 +37,6 @@ public function testGetDescription(): void
     public function testGetDefaultTitle(): void
     {
         $reflectionGetDefaultTitle = new ReflectionMethod(SiteTreeLink::class, 'getDefaultTitle');
-        $reflectionGetDefaultTitle->setAccessible(true);
-
         // Page does not exist
         $link = new SiteTreeLink();
         $this->assertSame('(Page missing)', $reflectionGetDefaultTitle->invoke($link));

tests/php/Tasks/GorriecoeMigrationTaskTest.php

@@ -675,18 +675,15 @@ private function callPrivateMethod(string $methodName, array $args = []): mixed
         $task = new GorriecoeMigrationTask();
         $output = new PolyOutput(PolyOutput::FORMAT_ANSI, wrappedOutput: $this->buffer);
         $reflectionProperty = new ReflectionProperty($task, 'output');
-        $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($task, $output);
 
         // getNeedsMigration() sets the table to pull from.
         // If we're not testing that method, we need to set the table ourselves.
         if ($this->name() !== 'testGetNeedsMigration') {
             $reflectionProperty = new ReflectionProperty($task, 'oldTableName');
-            $reflectionProperty->setAccessible(true);
             $reflectionProperty->setValue($task, self::OLD_LINK_TABLE);
         }
         $reflectionMethod = new ReflectionMethod($task, $methodName);
-        $reflectionMethod->setAccessible(true);
         return $reflectionMethod->invoke($task, ...$args);
     }
 }