PHP 8.4 compatibility updates

Author: opengeek

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3']
+        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout

_build/test/MODxControllerTestCase.php

@@ -30,7 +30,8 @@ abstract class MODxControllerTestCase extends MODxTestCase {
      */
     public $controllerName;
 
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
 
         /* load smarty template engine */
@@ -57,7 +58,8 @@ public function setUp() {
         }
     }
 
-    public function tearDown() {
+    public function tearDown(): void
+    {
         parent::tearDown();
         $this->controller = null;
     }

_build/test/MODxTestCase.php

@@ -28,7 +28,8 @@ abstract class MODxTestCase extends \PHPUnit\Framework\TestCase {
     /**
      * Ensure all tests have a reference to the MODX object
      */
-    public function setUp() {
+    public function setUp(): void
+    {
         $this->modx =& MODxTestHarness::getFixture('modX', 'modx');
         if ($this->modx->request) {
             $this->modx->request->loadErrorHandler();
@@ -43,7 +44,7 @@ public function setUp() {
     /**
      * Remove reference at end of test case
      */
-    public function tearDown() {}
+    public function tearDown(): void {}
 
     /**
      * Check a MODX return result for a success flag

_build/test/Tests/Cases/Request/MakeUrlTest.php

@@ -19,7 +19,8 @@
  * @group MakeUrl
  */
 class MakeUrlTest extends MODxTestCase {
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
 
         /** @var modResource $resource */
@@ -82,7 +83,8 @@ public function setUp() {
         //$this->modx->context->prepare(true);
         $this->modx->context->aliasMap = null;
     }
-    public function tearDown() {
+    public function tearDown(): void
+    {
         parent::tearDown();
         /** @var modResource $resource */
         $resource = $this->modx->getObject('modResource',array('pagetitle' => 'Unit Test Resource'));

_build/test/Tests/Controllers/Context/ContextUpdateControllerTest.php

@@ -26,7 +26,8 @@ class ContextUpdateControllerTest extends MODxControllerTestCase {
     public $controllerName = 'ContextUpdateManagerController';
     public $controllerPath = 'context/update';
 
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
         $this->controller->setProperty('key','web');
     }

_build/test/Tests/Controllers/DeprecatedControllerTest.php

@@ -9,12 +9,14 @@ class DeprecatedControllerTest extends MODxTestCase {
      */
     public $controller;
 
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
 
         $this->controller = new modManagerControllerDeprecated($this->modx);
     }
-    public function tearDown() {
+    public function tearDown(): void
+    {
         parent::tearDown();
         $this->controller = null;
     }

_build/test/Tests/Controllers/WelcomeControllerTest.php

@@ -25,7 +25,8 @@ class WelcomeControllerTest extends MODxControllerTestCase {
     public $controllerName = 'WelcomeManagerController';
     public $controllerPath = 'welcome';
 
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
 
         /** @var modDashboard $dashboard */
@@ -71,7 +72,8 @@ public function setUp() {
 
     }
 
-    public function tearDown() {
+    public function tearDown(): void
+    {
         parent::tearDown();
         $userGroups = $this->modx->getCollection('modUserGroup',array('name:LIKE' => '%Unit Test%'));
         /** @var modUserGroup $userGroup */

_build/test/Tests/Model/Dashboard/modDashboardTest.php

@@ -24,7 +24,8 @@ class modDashboardTest extends MODxTestCase {
      * Load some utility classes this case uses
      * @return void
      */
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
         $this->modx->loadClass('modDashboard');
         $this->modx->loadClass('modManagerController',MODX_CORE_PATH.'model/modx/',true,true);

_build/test/Tests/Model/Dashboard/modDashboardWidgetTest.php

@@ -26,7 +26,8 @@ class modDashboardWidgetTest extends MODxTestCase {
      * Load some utility classes this case uses
      * @return void
      */
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
         $this->modx->loadClass('modDashboard');
         $this->modx->loadClass('modDashboardWidget');

_build/test/Tests/Model/Element/modChunkTest.php

@@ -25,7 +25,8 @@ class modChunkTest extends MODxTestCase {
     /** @var modChunk $chunk */
     public $chunk;
 
-    public function setUp() {
+    public function setUp(): void
+    {
         parent::setUp();
         $this->chunk = $this->modx->newObject('modChunk');
         $this->chunk->fromArray(array(
@@ -39,7 +40,8 @@ public function setUp() {
         $this->chunk->setProperties(array('name' => 'John'));
         $this->chunk->setCacheable(false);
     }
-    public function tearDown() {
+    public function tearDown(): void
+    {
         parent::tearDown();
         $this->chunk = null;
     }