ISSUE-337: add pipeline

Author: tatevikg1

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-versions: ['8.1']
         dependencies: ['latest', 'oldest']
     steps:
       - name: Checkout
@@ -63,10 +63,10 @@ jobs:
       - name: Run integration tests with phpunit
         run: vendor/bin/phpunit tests/Integration/
       - name: Running the system tests
-        run: vendor/bin/phpunit tests/Integration/;
+        run: vendor/bin/phpunit tests/System/;
       - name: Running static analysis
         run: vendor/bin/phpstan analyse -l 5 src/ tests/;
       - name: Running PHPMD
         run: vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml;
       - name: Running PHP_CodeSniffer
-        run: vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/;
+        run: vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/;

.travis.yml

@@ -35,7 +35,7 @@
         "phpunit/phpunit": "^10.0",
         "guzzlehttp/guzzle": "^6.3.0",
         "squizlabs/php_codesniffer": "^3.2.0",
-        "phpstan/phpstan": "^0.12.57",
+        "phpstan/phpstan": "^1.10",
         "nette/caching": "^3.0.0",
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
@@ -86,7 +86,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0.x-dev"
+            "dev-ISSUE-337": "5.0.x-dev"
         },
         "symfony-app-dir": "bin",
         "symfony-bin-dir": "bin",

composer.json

@@ -6,6 +6,7 @@
 
 use PhpList\Core\Domain\Model\Messaging\SubscriberList;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
+use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
 use PhpList\Core\Security\Authentication;
@@ -62,7 +63,7 @@ public function getLists(Request $request): JsonResponse
     }
 
     #[Route('/lists/{id}', name: 'get_list', methods: ['GET'])]
-    public function getList(Request $request, SubscriberList $list): JsonResponse
+    public function getList(Request $request, #[MapEntity(mapping: ['id' => 'id'])] SubscriberList $list): JsonResponse
     {
         $this->requireAuthentication($request);
         $json = $this->serializer->serialize($list, 'json', [
@@ -73,8 +74,10 @@ public function getList(Request $request, SubscriberList $list): JsonResponse
     }
 
     #[Route('/lists/{id}', name: 'delete_list', methods: ['DELETE'])]
-    public function deleteList(Request $request, SubscriberList $list): JsonResponse
-    {
+    public function deleteList(
+        Request $request,
+        #[MapEntity(mapping: ['id' => 'id'])] SubscriberList $list
+    ): JsonResponse {
         $this->requireAuthentication($request);
 
         $this->subscriberListRepository->remove($list);
@@ -83,8 +86,10 @@ public function deleteList(Request $request, SubscriberList $list): JsonResponse
     }
 
     #[Route('/lists/{id}/members', name: 'get_subscriber_from_list', methods: ['GET'])]
-    public function getListMembers(Request $request, SubscriberList $list): JsonResponse
-    {
+    public function getListMembers(
+        Request $request,
+        #[MapEntity(mapping: ['id' => 'id'])] SubscriberList $list
+    ): JsonResponse {
         $this->requireAuthentication($request);
 
         $subscribers = $this->subscriberRepository->getSubscribersBySubscribedListId($list->getId());
@@ -97,8 +102,10 @@ public function getListMembers(Request $request, SubscriberList $list): JsonResp
     }
 
     #[Route('/lists/{id}/subscribers/count', name: 'get_subscribers_count_from_list', methods: ['GET'])]
-    public function getSubscribersCount(Request $request, SubscriberList $list): JsonResponse
-    {
+    public function getSubscribersCount(
+        Request $request,
+        #[MapEntity(mapping: ['id' => 'id'])] SubscriberList $list
+    ): JsonResponse {
         $this->requireAuthentication($request);
         $json = $this->serializer->serialize(count($list->getSubscribers()), 'json');
 

src/Controller/ListController.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Controller;
 
+use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Domain\Model\Identity\AdministratorToken;
@@ -24,7 +25,6 @@
  * This controller provides methods to create and destroy REST API sessions.
  *
  * @author Oliver Klee <[email protected]>
- * @author Tatevik Grigoryan <[email protected]>
  */
 class SessionController extends AbstractController
 {
@@ -83,8 +83,10 @@ public function createSession(Request $request): JsonResponse
      * @throws AccessDeniedHttpException
      */
     #[Route('/sessions/{id}', name: 'delete_session', methods: ['DELETE'])]
-    public function deleteAction(Request $request, AdministratorToken $token): JsonResponse
-    {
+    public function deleteAction(
+        Request $request,
+        #[MapEntity(mapping: ['id' => 'id'])] AdministratorToken $token
+    ): JsonResponse {
         $administrator = $this->requireAuthentication($request);
         if ($token->getAdministrator() !== $administrator) {
             throw new AccessDeniedHttpException('You do not have access to this session.', null, 1519831644);

src/Controller/SessionController.php

@@ -68,9 +68,11 @@ public function postAction(Request $request): JsonResponse
         $subscriber->setDisabled((bool)$data->get('disabled'));
         $this->subscriberRepository->save($subscriber);
 
-        $json = $this->serializer->serialize($subscriber, 'json');
-
-        return new JsonResponse($json, Response::HTTP_CREATED, [], true);
+        return new JsonResponse(
+            $this->serializer->serialize($subscriber, 'json'),
+            Response::HTTP_CREATED, [],
+            true
+        );
     }
 
     /**

src/Controller/SubscriberController.php

@@ -30,9 +30,6 @@ class PhpListRestExtension extends Extension
      */
     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($container, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yml');
     }