Dev

.github/workflows/ci.yml

@@ -73,6 +73,7 @@ jobs:
           export PHPLIST_DATABASE_PASSWORD=${{ env.DB_PASSWORD }}
           export PHPLIST_DATABASE_PORT=${{ job.services.mysql.ports['3306'] }}
           export PHPLIST_DATABASE_HOST=127.0.0.1
+          export PHPLIST_DATABASE_PATH=
           vendor/bin/phpunit tests/Integration/
         continue-on-error: ${{matrix.php-versions == '8.0' }} # [temp-php8]
       - name: Running static analysis

.gitignore

@@ -15,3 +15,5 @@
 /var/
 /vendor/
 .phpunit.result.cache
+.env
+.env.dist

composer.json

@@ -42,7 +42,7 @@
     },
     "require": {
         "php": "^8.1",
-        "phplist/core": "dev-main",
+        "phplist/core": "dev-dev",
         "friendsofsymfony/rest-bundle": "*",
         "symfony/test-pack": "^1.0",
         "symfony/process": "^6.4",
@@ -57,7 +57,7 @@
         "phpunit/phpunit": "^10.0",
         "guzzlehttp/guzzle": "^7.2.0",
         "squizlabs/php_codesniffer": "^3.2.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.2",
         "nette/caching": "^3.0.0",
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
@@ -85,6 +85,7 @@
             "PhpList\\Core\\Composer\\ScriptHandler::createGeneralConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
+            "PhpList\\Core\\Composer\\ScriptHandler::createDotenvConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
             "PhpList\\Core\\Composer\\ScriptHandler::clearAllCaches"
         ],

config/services.yml

@@ -12,7 +12,7 @@ services:
         calls:
             - ['registerHandler', [ 'json', ['@my.secure_handler', 'createResponse'] ] ]
 
-    PhpList\Core\Security\Authentication:
+    PhpList\Core\Domain\Identity\Service\Authentication:
         autowire: true
         autoconfigure: true
 

phpunit.xml.dist

@@ -5,10 +5,11 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
         <server name="KERNEL_CLASS" value="PhpList\Core\Core\ApplicationKernel"/>
+        <server name="APP_ENV" value="test" force="true"/>
     </php>
 </phpunit>

src/Common/Controller/BaseController.php

@@ -5,13 +5,13 @@
 namespace PhpList\RestBundle\Common\Controller;
 
 use PhpList\Core\Domain\Identity\Model\Administrator;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
-/**  @SuppressWarnings(PHPMD.NumberOfChildren) */
+/**  @SuppressWarnings("PHPMD.NumberOfChildren") */
 abstract class BaseController extends AbstractController
 {
     protected Authentication $authentication;

src/Common/EventListener/ExceptionListener.php

@@ -9,7 +9,7 @@
 use PhpList\Core\Domain\Messaging\Exception\AttachmentFileNotFoundException;
 use PhpList\Core\Domain\Messaging\Exception\MessageNotReceivedException;
 use PhpList\Core\Domain\Messaging\Exception\SubscriberNotFoundException;
-use PhpList\Core\Domain\Subscription\Exception\AttributeDefinitionCreationException;
+use PhpList\Core\Domain\Common\Exception\AttributeDefinitionCreationException;
 use PhpList\Core\Domain\Subscription\Exception\SubscriptionCreationException;
 use PhpList\Core\Domain\Common\Exception\InvalidUploadException;
 use PhpList\Core\Domain\Common\Exception\MissingUploadException;
@@ -57,7 +57,7 @@ public function onKernelException(ExceptionEvent $event): void
                 new JsonResponse([
                     'message' => 'Validation failed',
                     'errors' => $this->parseFlatValidationMessage($exception->getMessage()),
-                    ], 422)
+                ], 422)
             );
 
             return;

src/Common/Serializer/CursorPaginationNormalizer.php

@@ -11,7 +11,7 @@ class CursorPaginationNormalizer implements NormalizerInterface
 {
     /**
      * @param CursorPaginationResult $object
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function normalize($object, string $format = null, array $context = []): array
     {
@@ -32,10 +32,20 @@ public function normalize($object, string $format = null, array $context = []):
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof CursorPaginationResult;
     }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            CursorPaginationResult::class => true,
+        ];
+    }
 }

src/Configuration/Controller/ConfigController.php

@@ -10,7 +10,7 @@
 use PhpList\Core\Domain\Configuration\Model\Config;
 use PhpList\Core\Domain\Configuration\Service\Manager\ConfigManager;
 use PhpList\Core\Domain\Identity\Model\PrivilegeFlag;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use PhpList\RestBundle\Configuration\Request\CreateConfigRequest;

src/Configuration/Serializer/ConfigNormalizer.php

@@ -23,7 +23,7 @@ class ConfigNormalizer implements NormalizerInterface
     /**
      * Normalizes a configuration item.
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function normalize($object, string $format = null, array $context = []): array
     {
@@ -42,10 +42,20 @@ public function normalize($object, string $format = null, array $context = []):
     /**
      * Checks whether the value can be normalized.
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof Config;
     }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            Config::class => true,
+        ];
+    }
 }

src/Identity/Controller/AdminAttributeDefinitionController.php

@@ -9,7 +9,7 @@
 use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 use PhpList\Core\Domain\Identity\Model\AdminAttributeDefinition;
 use PhpList\Core\Domain\Identity\Service\Manager\AdminAttributeDefinitionManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Common\Validator\RequestValidator;

src/Identity/Controller/AdminAttributeValueController.php

@@ -11,7 +11,7 @@
 use PhpList\Core\Domain\Identity\Model\AdminAttributeDefinition;
 use PhpList\Core\Domain\Identity\Model\AdminAttributeValue;
 use PhpList\Core\Domain\Identity\Service\Manager\AdminAttributeManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Common\Validator\RequestValidator;

src/Identity/Controller/AdministratorController.php

@@ -9,7 +9,7 @@
 use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Identity\Service\Manager\AdministratorManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Common\Validator\RequestValidator;

src/Identity/Controller/PasswordResetController.php

@@ -7,7 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Identity\Service\Manager\PasswordManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use PhpList\RestBundle\Identity\Request\RequestPasswordResetRequest;

src/Identity/Controller/SessionController.php

@@ -8,7 +8,7 @@
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Identity\Model\AdministratorToken;
 use PhpList\Core\Domain\Identity\Service\Manager\SessionManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use PhpList\RestBundle\Identity\Request\CreateSessionRequest;

src/Identity/Serializer/AdminAttributeDefinitionNormalizer.php

@@ -23,7 +23,7 @@
 class AdminAttributeDefinitionNormalizer implements NormalizerInterface
 {
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function normalize($object, string $format = null, array $context = []): array
     {
@@ -42,10 +42,20 @@ public function normalize($object, string $format = null, array $context = []):
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof AdminAttributeDefinition;
     }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            AdminAttributeDefinition::class => true,
+        ];
+    }
 }

src/Identity/Serializer/AdminAttributeValueNormalizer.php

@@ -26,7 +26,7 @@ public function __construct(
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function normalize($object, string $format = null, array $context = []): array
     {
@@ -42,10 +42,20 @@ public function normalize($object, string $format = null, array $context = []):
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof AdminAttributeValue;
     }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            AdminAttributeValue::class => true,
+        ];
+    }
 }

src/Identity/Serializer/AdministratorNormalizer.php

@@ -30,7 +30,7 @@
 class AdministratorNormalizer implements NormalizerInterface
 {
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      * @throws InvalidArgumentException
      */
     public function normalize($object, string $format = null, array $context = []): array
@@ -45,15 +45,25 @@ public function normalize($object, string $format = null, array $context = []):
             'email' => $object->getEmail(),
             'super_user' => $object->isSuperUser(),
             'privileges' => $object->getPrivileges()->all(),
-            'created_at' => $object->getCreatedAt()?->format(DateTimeInterface::ATOM),
+            'created_at' => $object->getCreatedAt()->format(DateTimeInterface::ATOM),
         ];
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof Administrator;
     }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            Administrator::class => true,
+        ];
+    }
 }

src/Identity/Serializer/AdministratorTokenNormalizer.php

@@ -11,7 +11,7 @@
 class AdministratorTokenNormalizer implements NormalizerInterface
 {
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function normalize($object, string $format = null, array $context = []): array
     {
@@ -27,10 +27,20 @@ public function normalize($object, string $format = null, array $context = []):
     }
 
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof AdministratorToken;
     }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            AdministratorToken::class => true,
+        ];
+    }
 }

src/Messaging/Controller/AttachmentController.php

@@ -7,7 +7,7 @@
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Messaging\Model\Attachment;
 use PhpList\Core\Domain\Messaging\Service\AttachmentDownloadService;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;

src/Messaging/Controller/BounceController.php

@@ -9,7 +9,7 @@
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Repository\BounceRepository;
 use PhpList\Core\Domain\Messaging\Repository\UserMessageBounceRepository;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Common\Validator\RequestValidator;

src/Messaging/Controller/BounceRegexController.php

@@ -8,7 +8,7 @@
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Messaging\Model\BounceRegex;
 use PhpList\Core\Domain\Messaging\Service\Manager\BounceRegexManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use PhpList\RestBundle\Messaging\Request\BounceRegexRequest;

src/Messaging/Controller/CampaignActionController.php

@@ -11,7 +11,7 @@
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
 use PhpList\Core\Domain\Messaging\Service\Manager\MessageManager;
-use PhpList\Core\Security\Authentication;
+use PhpList\Core\Domain\Identity\Service\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
 use PhpList\RestBundle\Common\Validator\RequestValidator;
 use PhpList\RestBundle\Messaging\Request\Message\MessageMetadataRequest;