Merge pull request #150 from Xerkus/feature/fix-deprecations-in-tests

Fix PHP 8.2 deprecations in tests
laminas · Mar 15, 2023 · f12e801 · f12e801
2 parents 490cdff + 9a85857
commit f12e801
Show file tree

Hide file tree

Showing 23 changed files with 342 additions and 1,455 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,7 +1 @@
-{
-    "ignore_php_platform_requirements": {
-        "8.0": true,
-        "8.1": true,
-        "8.2": true
-    }
-}
+{}
diff --git a/composer.json b/composer.json
@@ -33,20 +33,18 @@
         "laminas/laminas-eventmanager": "^3.4",
         "laminas/laminas-http": "^2.15",
         "laminas/laminas-modulemanager": "^2.8",
-        "laminas/laminas-router": "^3.5",
-        "laminas/laminas-servicemanager": "^3.7",
+        "laminas/laminas-router": "^3.11.1",
+        "laminas/laminas-servicemanager": "^3.20.0",
         "laminas/laminas-stdlib": "^3.6",
         "laminas/laminas-view": "^2.14"
     },
     "require-dev": {
-        "http-interop/http-middleware": "^0.4.1",
         "laminas/laminas-coding-standard": "^2.4.0",
         "laminas/laminas-json": "^3.3",
-        "laminas/laminas-psr7bridge": "^1.8",
-        "laminas/laminas-stratigility": ">=2.0.1 <2.2",
-        "phpspec/prophecy" : "^1.15.0",
+        "phpspec/prophecy": "^1.15.0",
         "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpunit/phpunit": "^9.5.25"
+        "phpunit/phpunit": "^9.5.25",
+        "webmozart/assert": "^1.11"
     },
     "suggest": {
         "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",

diff --git a/composer.lock b/composer.lock
diff --git a/test/Controller/ActionControllerTest.php b/test/Controller/ActionControllerTest.php
@@ -26,6 +26,9 @@ class ActionControllerTest extends TestCase
     public $event;
     public $request;
     public $response;
+    private RouteMatch $routeMatch;
+    private SharedEventManager $sharedEvents;
+    private EventManager $events;
 
     public function setUp(): void
     {

diff --git a/test/Controller/ControllerManagerTest.php b/test/Controller/ControllerManagerTest.php
@@ -16,6 +16,11 @@
 
 class ControllerManagerTest extends TestCase
 {
+    private SharedEventManager $sharedEvents;
+    private EventManager $events;
+    private ServiceManager $services;
+    private ControllerManager $controllers;
+
     public function setUp(): void
     {
         $this->sharedEvents   = new SharedEventManager;

diff --git a/test/Controller/IntegrationTest.php b/test/Controller/IntegrationTest.php
@@ -13,6 +13,9 @@
 
 class IntegrationTest extends TestCase
 {
+    private SharedEventManager $sharedEvents;
+    private ServiceManager $services;
+
     public function setUp(): void
     {
         $this->sharedEvents = new SharedEventManager();

diff --git a/test/Controller/MiddlewareControllerTest.php b/test/Controller/MiddlewareControllerTest.php
diff --git a/test/Controller/Plugin/AcceptableViewModelSelectorTest.php b/test/Controller/Plugin/AcceptableViewModelSelectorTest.php
@@ -2,6 +2,7 @@
 
 namespace LaminasTest\Mvc\Controller\Plugin;
 
+use Laminas\Mvc\Controller\Plugin\AcceptableViewModelSelector;
 use Laminas\View\Model\JsonModel;
 use Laminas\View\Model\FeedModel;
 use Laminas\View\Model\ViewModel;
@@ -16,6 +17,11 @@
 
 class AcceptableViewModelSelectorTest extends TestCase
 {
+    private Request $request;
+    private MvcEvent $event;
+    private SampleController $controller;
+    private AcceptableViewModelSelector $plugin;
+
     public function setUp(): void
     {
         $this->request = new Request();

diff --git a/test/Controller/Plugin/ForwardTest.php b/test/Controller/Plugin/ForwardTest.php
@@ -41,6 +41,7 @@ class ForwardTest extends TestCase
      * @var Forward
      */
     private $plugin;
+    private ServiceManager $services;
 
     public function setUp(): void
     {

diff --git a/test/Controller/Plugin/LayoutTest.php b/test/Controller/Plugin/LayoutTest.php
@@ -11,6 +11,10 @@
 
 class LayoutTest extends TestCase
 {
+    private MvcEvent $event;
+    private SampleController $controller;
+    private LayoutPlugin $plugin;
+
     public function setUp(): void
     {
         $this->event      = $event = new MvcEvent();

diff --git a/test/Controller/Plugin/ParamsTest.php b/test/Controller/Plugin/ParamsTest.php
@@ -5,13 +5,18 @@
 use Laminas\Http\Header\GenericHeader;
 use Laminas\Http\Request;
 use Laminas\Http\Response;
+use Laminas\Mvc\Controller\Plugin\Params;
 use Laminas\Mvc\MvcEvent;
 use Laminas\Router\RouteMatch;
 use LaminasTest\Mvc\Controller\TestAsset\SampleController;
 use PHPUnit\Framework\TestCase;
 
 class ParamsTest extends TestCase
 {
+    private Request $request;
+    private SampleController $controller;
+    private Params $plugin;
+
     public function setUp(): void
     {
         $this->request = new Request;

diff --git a/test/Controller/Plugin/RedirectTest.php b/test/Controller/Plugin/RedirectTest.php
@@ -16,6 +16,13 @@
 
 class RedirectTest extends TestCase
 {
+    private Response $response;
+    private SimpleRouteStack $router;
+    private RouteMatch $routeMatch;
+    private MvcEvent $event;
+    private SampleController $controller;
+    private RedirectPlugin $plugin;
+
     public function setUp(): void
     {
         $this->response = new Response();

diff --git a/test/Controller/Plugin/UrlTest.php b/test/Controller/Plugin/UrlTest.php
@@ -20,6 +20,10 @@
 
 class UrlTest extends TestCase
 {
+    private SimpleRouteStack $router;
+    private SampleController $controller;
+    private UrlPlugin $plugin;
+
     public function setUp(): void
     {
         $router = new SimpleRouteStack;

diff --git a/test/Controller/RestfulControllerTest.php b/test/Controller/RestfulControllerTest.php
@@ -28,6 +28,8 @@ class RestfulControllerTest extends TestCase
     public $response;
     public $routeMatch;
     public $event;
+    private SharedEventManager $sharedEvents;
+    private EventManager $events;
 
     public function setUp(): void
     {