ISSUE-337: move support back

phpList · Dec 4, 2024 · df46140 · df46140
1 parent 12d014c
commit df46140
Show file tree

Hide file tree

Showing 42 changed files with 634 additions and 1,764 deletions.
diff --git a/composer.json b/composer.json
@@ -59,7 +59,9 @@
         "nikic/php-parser": "^4.19.1",
         "phpmd/phpmd": "^2.6.0",
         "symfony/test-pack": "^1.1",
-        "symfony/process": "^6.4"
+        "symfony/process": "^6.4",
+        "composer/composer": "^2.7",
+        "symfony/symfony": "^6.4"
     },
     "suggest": {
         "phplist/web-frontend": "5.0.x-dev",

diff --git a/src/EmptyStartPageBundle/Controller/DefaultController.php b/src/EmptyStartPageBundle/Controller/DefaultController.php
@@ -5,6 +5,7 @@
 namespace PhpList\Core\EmptyStartPageBundle\Controller;
 
 use InvalidArgumentException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -13,7 +14,7 @@
  *
  * @author Oliver Klee <[email protected]>
  */
-class DefaultController
+class DefaultController extends AbstractController
 {
     /**
      * An empty start page route.

diff --git a/...Traits/ContainsInstanceAssertionTrait.php → ...Traits/ContainsInstanceAssertionTrait.php b/...Traits/ContainsInstanceAssertionTrait.php → ...Traits/ContainsInstanceAssertionTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\TestingSupport\Traits;
+namespace PhpList\Core\TestingSupport\Traits;
 
 /**
  * This trait provides the assertContainsInstanceOf method.

diff --git a/...stingSupport/Traits/DatabaseTestTrait.php → ...stingSupport/Traits/DatabaseTestTrait.php b/...stingSupport/Traits/DatabaseTestTrait.php → ...stingSupport/Traits/DatabaseTestTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\TestingSupport\Traits;
+namespace PhpList\Core\TestingSupport\Traits;
 
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\ORM\EntityManagerInterface;

diff --git a/.../TestingSupport/Traits/ModelTestTrait.php → src/TestingSupport/Traits/ModelTestTrait.php b/.../TestingSupport/Traits/ModelTestTrait.php → src/TestingSupport/Traits/ModelTestTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\TestingSupport\Traits;
+namespace PhpList\Core\TestingSupport\Traits;
 
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
 use ReflectionObject;

diff --git a/...ort/Traits/SimilarDatesAssertionTrait.php → ...ort/Traits/SimilarDatesAssertionTrait.php b/...ort/Traits/SimilarDatesAssertionTrait.php → ...ort/Traits/SimilarDatesAssertionTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\TestingSupport\Traits;
+namespace PhpList\Core\TestingSupport\Traits;
 
 use DateTime;
 

diff --git a/...tingSupport/Traits/SymfonyServerTrait.php → ...tingSupport/Traits/SymfonyServerTrait.php b/...tingSupport/Traits/SymfonyServerTrait.php → ...tingSupport/Traits/SymfonyServerTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Tests\TestingSupport\Traits;
+namespace PhpList\Core\TestingSupport\Traits;
 
 use InvalidArgumentException;
 use PhpList\Core\Core\ApplicationStructure;

diff --git a/tests/Integration/Domain/Repository/Fixtures/AdministratorFixture.php b/tests/Integration/Domain/Repository/Fixtures/AdministratorFixture.php
@@ -8,7 +8,7 @@
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
 use PhpList\Core\Domain\Model\Identity\Administrator;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
+use PhpList\Core\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
 class AdministratorFixture extends Fixture

diff --git a/tests/Integration/Domain/Repository/Fixtures/AdministratorTokenWithAdministratorFixture.php b/tests/Integration/Domain/Repository/Fixtures/AdministratorTokenWithAdministratorFixture.php
@@ -9,7 +9,7 @@
 use Doctrine\Persistence\ObjectManager;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Domain\Model\Identity\AdministratorToken;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
+use PhpList\Core\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
 

diff --git a/tests/Integration/Domain/Repository/Fixtures/DetachedAdministratorTokenFixture.php b/tests/Integration/Domain/Repository/Fixtures/DetachedAdministratorTokenFixture.php
@@ -8,7 +8,7 @@
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
 use PhpList\Core\Domain\Model\Identity\AdministratorToken;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
+use PhpList\Core\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
 class DetachedAdministratorTokenFixture extends Fixture

diff --git a/tests/Integration/Domain/Repository/Fixtures/SubscriberListFixture.php b/tests/Integration/Domain/Repository/Fixtures/SubscriberListFixture.php
@@ -9,7 +9,7 @@
 use Doctrine\Persistence\ObjectManager;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Domain\Model\Messaging\SubscriberList;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
+use PhpList\Core\TestingSupport\Traits\ModelTestTrait;
 use RuntimeException;
 
 class SubscriberListFixture extends Fixture

diff --git a/tests/Integration/Domain/Repository/Identity/AdministratorRepositoryTest.php b/tests/Integration/Domain/Repository/Identity/AdministratorRepositoryTest.php
@@ -8,9 +8,9 @@
 use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Domain\Repository\Identity\AdministratorRepository;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
+use PhpList\Core\TestingSupport\Traits\ModelTestTrait;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorFixture;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
-use PhpList\Core\Tests\TestingSupport\Traits\ModelTestTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**

diff --git a/tests/Integration/Domain/Repository/Identity/AdministratorTokenRepositoryTest.php b/tests/Integration/Domain/Repository/Identity/AdministratorTokenRepositoryTest.php
@@ -10,10 +10,10 @@
 use PhpList\Core\Domain\Model\Identity\AdministratorToken;
 use PhpList\Core\Domain\Repository\Identity\AdministratorRepository;
 use PhpList\Core\Domain\Repository\Identity\AdministratorTokenRepository;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
+use PhpList\Core\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\DetachedAdministratorTokenFixture;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
-use PhpList\Core\Tests\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**

diff --git a/tests/Integration/Domain/Repository/Messaging/SubscriberListRepositoryTest.php b/tests/Integration/Domain/Repository/Messaging/SubscriberListRepositoryTest.php
@@ -6,20 +6,19 @@
 
 use DateTime;
 use Doctrine\ORM\Tools\SchemaTool;
-use Doctrine\Persistence\Proxy;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Domain\Model\Messaging\SubscriberList;
 use PhpList\Core\Domain\Model\Subscription\Subscription;
 use PhpList\Core\Domain\Repository\Identity\AdministratorRepository;
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriptionRepository;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
+use PhpList\Core\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberListFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriptionFixture;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
-use PhpList\Core\Tests\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**

diff --git a/tests/Integration/Domain/Repository/Subscription/SubscriberRepositoryTest.php b/tests/Integration/Domain/Repository/Subscription/SubscriberRepositoryTest.php
@@ -12,11 +12,11 @@
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriptionRepository;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
+use PhpList\Core\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberListFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriptionFixture;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
-use PhpList\Core\Tests\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**

diff --git a/tests/Integration/Domain/Repository/Subscription/SubscriptionRepositoryTest.php b/tests/Integration/Domain/Repository/Subscription/SubscriptionRepositoryTest.php
@@ -5,21 +5,22 @@
 namespace PhpList\Core\Tests\Integration\Domain\Repository\Subscription;
 
 use DateTime;
-//use Doctrine\ORM\Proxy\Proxy;
 use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Domain\Model\Messaging\SubscriberList;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Model\Subscription\Subscription;
 use PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use PhpList\Core\Domain\Repository\Subscription\SubscriptionRepository;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
+use PhpList\Core\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriberListFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\SubscriptionFixture;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
-use PhpList\Core\Tests\TestingSupport\Traits\SimilarDatesAssertionTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
+//use Doctrine\ORM\Proxy\Proxy;
+
 /**
  * Testcase.
  *

diff --git a/tests/Integration/Security/AuthenticationTest.php b/tests/Integration/Security/AuthenticationTest.php
@@ -7,9 +7,9 @@
 use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Domain\Model\Identity\Administrator;
 use PhpList\Core\Security\Authentication;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorFixture;
 use PhpList\Core\Tests\Integration\Domain\Repository\Fixtures\AdministratorTokenWithAdministratorFixture;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
 

diff --git a/tests/Integration/Security/HashGeneratorTest.php b/tests/Integration/Security/HashGeneratorTest.php
@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\Security\HashGenerator;
-use PhpList\Core\Tests\TestingSupport\Traits\DatabaseTestTrait;
+use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**

diff --git a/tests/System/ApplicationBundle/PhpListApplicationBundleTest.php b/tests/System/ApplicationBundle/PhpListApplicationBundleTest.php
@@ -5,7 +5,7 @@
 namespace PhpList\Core\Tests\System\ApplicationBundle;
 
 use GuzzleHttp\Client;
-use PhpList\Core\Tests\TestingSupport\Traits\SymfonyServerTrait;
+use PhpList\Core\TestingSupport\Traits\SymfonyServerTrait;
 use PHPUnit\Framework\TestCase;
 
 /**

diff --git a/tests/TestingSupport/AbstractWebTest.php b/tests/TestingSupport/AbstractWebTest.php