ISSUE-337: update package versions

composer.json

@@ -25,22 +25,20 @@
         "source": "https://github.com/phpList/rest-api"
     },
     "require": {
-        "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0",
-
-        "phplist/core": "dev-phplist3",
-        "friendsofsymfony/rest-bundle": "^2.3",
-        "sensio/framework-extra-bundle": "5.1.0"
+        "php": "^8.1",
+        "phplist/core": "dev-ISSUE-337",
+        "friendsofsymfony/rest-bundle": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5.6",
-        "phpunit/phpunit-mock-objects": "^5.0.6",
-        "phpunit/dbunit": "^3.0.0",
+        "phpunit/phpunit": "^10.0",
         "guzzlehttp/guzzle": "^6.3.0",
         "squizlabs/php_codesniffer": "^3.2.0",
-        "phpstan/phpstan": "^0.7.0",
-        "nette/caching": "^2.5.0 || ^3.0.0",
-        "nikic/php-parser": "^3.1.0",
-        "phpmd/phpmd": "^2.6.0"
+        "phpstan/phpstan": "^0.7.0|0.12.57",
+        "nette/caching": "^2.5.0|^3.0.0",
+        "nikic/php-parser": "^4.19.1",
+        "phpmd/phpmd": "^2.6.0",
+        "composer/composer": "^1.6.0",
+        "doctrine/instantiator": "^1.0.5"
     },
     "autoload": {
         "psr-4": {
@@ -119,7 +117,6 @@
                         "view_response_listener": {
                             "enabled": false
                         }
-
                     },
                     "exception": {
                         "enabled": true,

src/Controller/ListController.php

@@ -1,10 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\RestBundle\Controller;
 
-use FOS\RestBundle\Controller\FOSRestController;
-use FOS\RestBundle\Routing\ClassResourceInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use FOS\RestBundle\View\View;
 use PhpList\Core\Domain\Model\Messaging\SubscriberList;
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
@@ -18,14 +18,14 @@
  * @author Oliver Klee <oliver@phplist.com>
  * @author Xheni Myrtaj <xheni@phplist.com>
  */
-class ListController extends FOSRestController implements ClassResourceInterface
+class ListController extends AbstractController
 {
     use AuthenticationTrait;
 
     /**
      * @var SubscriberListRepository
      */
-    private $subscriberListRepository = null;
+    private SubscriberListRepository $subscriberListRepository;
 
     /**
      * @param Authentication $authentication

src/Controller/SessionController.php

@@ -1,10 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\RestBundle\Controller;
 
-use FOS\RestBundle\Controller\FOSRestController;
-use FOS\RestBundle\Routing\ClassResourceInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use FOS\RestBundle\View\View;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Domain\Model\Identity\AdministratorToken;
@@ -23,19 +23,19 @@
  *
  * @author Oliver Klee <oliver@phplist.com>
  */
-class SessionController extends FOSRestController implements ClassResourceInterface
+class SessionController extends AbstractController
 {
     use AuthenticationTrait;
 
     /**
      * @var AdministratorRepository
      */
-    private $administratorRepository = null;
+    private AdministratorRepository $administratorRepository;
 
     /**
      * @var AdministratorTokenRepository
      */
-    private $tokenRepository = null;
+    private AdministratorTokenRepository $tokenRepository;
 
     /**
      * @param Authentication $authentication
@@ -110,7 +110,7 @@ public function deleteAction(Request $request, AdministratorToken $token): View
      *
      * @throws BadRequestHttpException
      */
-    private function validateCreateRequest(Request $request)
+    private function validateCreateRequest(Request $request): void
     {
         if ($request->getContent() === '') {
             throw new BadRequestHttpException('Empty JSON data', null, 1500559729);

src/Controller/SubscriberController.php

@@ -1,10 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\RestBundle\Controller;
 
-use FOS\RestBundle\Controller\FOSRestController;
-use FOS\RestBundle\Routing\ClassResourceInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use FOS\RestBundle\View\View;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
@@ -20,14 +20,14 @@
  *
  * @author Oliver Klee <oliver@phplist.com>
  */
-class SubscriberController extends FOSRestController implements ClassResourceInterface
+class SubscriberController extends AbstractController
 {
     use AuthenticationTrait;
 
     /**
      * @var SubscriberRepository
      */
-    private $subscriberRepository = null;
+    private SubscriberRepository $subscriberRepository;
 
     /**
      * @param Authentication $authentication
@@ -78,7 +78,7 @@ public function postAction(Request $request): View
      *
      * @throws UnprocessableEntityHttpException
      */
-    private function validateSubscriber(Request $request)
+    private function validateSubscriber(Request $request): void
     {
         /** @var string[] $invalidFields */
         $invalidFields = [];

src/DependencyInjection/PhpListRestExtension.php

@@ -1,8 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\RestBundle\DependencyInjection;
 
+use Exception;
+use InvalidArgumentException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -19,18 +22,18 @@ class PhpListRestExtension extends Extension
      * Loads a specific configuration.
      *
      * @param array $configs configuration values
-     * @param ContainerBuilder $containerBuilder
+     * @param ContainerBuilder $container
      *
      * @return void
      *
-     * @throws \InvalidArgumentException if the provided tag is not defined in this extension
+     * @throws InvalidArgumentException|Exception if the provided tag is not defined in this extension
      */
-    public function load(array $configs, ContainerBuilder $containerBuilder)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         // This parameter is unused, but not optional. This line will avoid a static analysis warning this.
         $configs;
 
-        $loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__ . '/../../config'));
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yml');
     }
 }

src/PhpListRestBundle.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\RestBundle;

src/ViewHandler/SecuredViewHandler.php

@@ -16,7 +16,7 @@
 class SecuredViewHandler
 {
     /**
-     * @param ViewHandler $viewHandler
+     * @param ViewHandler $handler
      * @param View $view
      * @param Request $request
      * @param string $format