fix: Fixed unit tests namespaces, moved to tests folder and use `auto…

…load-dev` composer directive

composer.json

@@ -193,13 +193,16 @@
             "RZ\\Roadiz\\Typescript\\Declaration\\": "lib/DtsGenerator/src/",
             "RZ\\Roadiz\\UserBundle\\": "lib/RoadizUserBundle/src/",
             "RZ\\Roadiz\\Utils\\": "lib/Models/src/Roadiz/Utils/",
-            "Themes\\": "themes/",
             "Themes\\Rozier\\": "lib/Rozier/src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\Tests\\": "tests/"
+            "App\\Tests\\": "tests/",
+            "RZ\\Roadiz\\Tests\\": "lib/Models/tests/",
+            "RZ\\Roadiz\\CoreBundle\\Tests\\": "lib/RoadizCoreBundle/tests/",
+            "RZ\\Roadiz\\Documents\\Tests\\": "lib/Documents/tests/",
+            "RZ\\Roadiz\\EntityGenerator\\Tests\\": "lib/EntityGenerator/tests/"
         }
     },
     "replace": {

lib/Documents/.github/workflows/run-test.yml

@@ -36,7 +36,7 @@ jobs:
             - name: Install Dependencies
               run: composer install --no-scripts --no-ansi --no-interaction --no-progress
             - name: Run Unit tests
-              run: vendor/bin/phpunit -v --whitelist ./src --coverage-clover ./build/logs/clover.xml src/Test
+              run: vendor/bin/phpunit -v --whitelist ./src tests
             - name: Run PHP Code Sniffer
               run: vendor/bin/phpcs -p ./src
             - name: Run PHPStan

lib/Documents/composer.json

@@ -55,6 +55,11 @@
             "RZ\\Roadiz\\Documents\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "RZ\\Roadiz\\Documents\\Tests\\": "tests/"
+        }
+    },
     "config": {
         "allow-plugins": {
             "composer/package-versions-deprecated": true,

lib/Documents/src/Test/MediaFinders/SimpleVimeoEmbedFinder.php → lib/Documents/tests/MediaFinders/SimpleVimeoEmbedFinder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\MediaFinders;
+namespace RZ\Roadiz\Documents\Tests\MediaFinders;
 
 use Doctrine\Persistence\ObjectManager;
 use RZ\Roadiz\Documents\MediaFinders\AbstractVimeoEmbedFinder;

lib/Documents/src/Test/MediaFinders/SimpleYoutubeEmbedFinder.php → lib/Documents/tests/MediaFinders/SimpleYoutubeEmbedFinder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\MediaFinders;
+namespace RZ\Roadiz\Documents\Tests\MediaFinders;
 
 use Doctrine\Persistence\ObjectManager;
 use RZ\Roadiz\Documents\MediaFinders\AbstractYoutubeEmbedFinder;

lib/Documents/src/Test/Renderer/AbstractRendererTestCase.php → lib/Documents/tests/Renderer/AbstractRendererTestCase.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use League\Flysystem\Config;
 use League\Flysystem\Filesystem;
@@ -12,8 +12,8 @@
 use League\Flysystem\UrlGeneration\PublicUrlGenerator;
 use PHPUnit\Framework\TestCase;
 use RZ\Roadiz\Documents\MediaFinders\EmbedFinderFactory;
-use RZ\Roadiz\Documents\Test\MediaFinders\SimpleVimeoEmbedFinder;
-use RZ\Roadiz\Documents\Test\MediaFinders\SimpleYoutubeEmbedFinder;
+use RZ\Roadiz\Documents\Tests\MediaFinders\SimpleVimeoEmbedFinder;
+use RZ\Roadiz\Documents\Tests\MediaFinders\SimpleYoutubeEmbedFinder;
 use RZ\Roadiz\Documents\UrlGenerators\DocumentUrlGeneratorInterface;
 use RZ\Roadiz\Documents\UrlGenerators\DummyDocumentUrlGenerator;
 use Twig\Environment;
@@ -38,7 +38,7 @@ protected function getFilesystemOperator(): FilesystemOperator
     {
         return new MountManager([
             'public' => new Filesystem(
-                new LocalFilesystemAdapter(dirname(__DIR__) . '/../../files/'),
+                new LocalFilesystemAdapter(dirname(__DIR__) . '/../files/'),
                 publicUrlGenerator: new class () implements PublicUrlGenerator
                 {
                     public function publicUrl(string $path, Config $config): string
@@ -48,7 +48,7 @@ public function publicUrl(string $path, Config $config): string
                 }
             ),
             'private' => new Filesystem(
-                new LocalFilesystemAdapter(dirname(__DIR__) . '/../../files/'),
+                new LocalFilesystemAdapter(dirname(__DIR__) . '/../files/'),
                 publicUrlGenerator: new class () implements PublicUrlGenerator
                 {
                     public function publicUrl(string $path, Config $config): string
@@ -63,7 +63,7 @@ public function publicUrl(string $path, Config $config): string
     protected function getEnvironment(): Environment
     {
         $loader = new FilesystemLoader([
-            dirname(__DIR__) . '/../Resources/views'
+            dirname(__DIR__) . '/../src/Resources/views'
         ]);
         return new Environment($loader, [
             'autoescape' => false

lib/Documents/src/Test/Renderer/AudioRendererTest.php → lib/Documents/tests/Renderer/AudioRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\ArrayDocumentFinder;
 use RZ\Roadiz\Documents\DocumentFinderInterface;

lib/Documents/src/Test/Renderer/ChainRendererTest.php → lib/Documents/tests/Renderer/ChainRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\SimpleDocument;
 use RZ\Roadiz\Documents\Renderer;

lib/Documents/src/Test/Renderer/EmbedRendererTest.php → lib/Documents/tests/Renderer/EmbedRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\SimpleDocument;
 use RZ\Roadiz\Documents\Renderer\EmbedRenderer;

lib/Documents/src/Test/Renderer/ImageRendererTest.php → lib/Documents/tests/Renderer/ImageRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\SimpleDocument;
 use RZ\Roadiz\Documents\Renderer\ImageRenderer;

lib/Documents/src/Test/Renderer/InlineSvgRendererTest.php → lib/Documents/tests/Renderer/InlineSvgRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\SimpleDocument;
 use RZ\Roadiz\Documents\Renderer\InlineSvgRenderer;

lib/Documents/src/Test/Renderer/PdfRendererTest.php → lib/Documents/tests/Renderer/PdfRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\SimpleDocument;
 use RZ\Roadiz\Documents\Renderer\PdfRenderer;

lib/Documents/src/Test/Renderer/PictureRendererTest.php → lib/Documents/tests/Renderer/PictureRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\SimpleDocument;
 use RZ\Roadiz\Documents\Renderer\PictureRenderer;

lib/Documents/src/Test/Renderer/SvgRendererTest.php → lib/Documents/tests/Renderer/SvgRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\Models\DocumentInterface;
 use RZ\Roadiz\Documents\Models\SimpleDocument;

lib/Documents/src/Test/Renderer/VideoRendererTest.php → lib/Documents/tests/Renderer/VideoRendererTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\Documents\Test\Renderer;
+namespace RZ\Roadiz\Documents\Tests\Renderer;
 
 use RZ\Roadiz\Documents\ArrayDocumentFinder;
 use RZ\Roadiz\Documents\DocumentFinderInterface;

lib/EntityGenerator/.github/workflows/run-test.yml

@@ -40,4 +40,4 @@ jobs:
             - name: Run PHPStan
               run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon
             - name: Run unit tests
-              run: vendor/bin/phpunit -v --whitelist ./src --coverage-clover ./build/logs/clover.xml src/Test
+              run: vendor/bin/phpunit -v --whitelist ./src tests

lib/EntityGenerator/composer.json

@@ -25,8 +25,12 @@
     },
     "autoload": {
         "psr-4": {
-            "RZ\\Roadiz\\EntityGenerator\\": "src/",
-            "tests\\mocks\\": "tests/mocks/"
+            "RZ\\Roadiz\\EntityGenerator\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "RZ\\Roadiz\\EntityGenerator\\Tests\\": "tests/"
         }
     },
     "require-dev": {

lib/EntityGenerator/src/Test/EntityGeneratorFactoryTest.php → lib/EntityGenerator/tests/EntityGeneratorFactoryTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\EntityGenerator\Test;
+namespace RZ\Roadiz\EntityGenerator\Tests;
 
 use PHPUnit\Framework\TestCase;
 use RZ\Roadiz\EntityGenerator\EntityGeneratorFactory;
@@ -25,7 +25,7 @@ protected function getEntityGeneratorFactory(?array $options = null): EntityGene
                 'custom_form_class' => '\mock\Entity\CustomForm',
                 'custom_form_proxy_class' => '\mock\Entity\NodesSourcesCustomForm',
                 'repository_class' => '\mock\Entity\Repository\NodesSourcesRepository',
-                'namespace' => '\tests\mocks\GeneratedNodesSources',
+                'namespace' => '\RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSources',
                 'use_native_json' => true,
                 'use_api_platform_filters' => true,
             ]
@@ -37,7 +37,7 @@ public function testCreate(): void
         $generator = $this->getEntityGeneratorFactory();
 
         $this->assertEquals(
-            file_get_contents(dirname(__DIR__) . '/../tests/mocks/GeneratedNodesSources/NSMock.php'),
+            file_get_contents(dirname(__DIR__) . '/tests/Mocks/GeneratedNodesSources/NSMock.php'),
             $generator->create($this->getMockNodeType())->getClassContent()
         );
     }
@@ -53,7 +53,7 @@ public function testCreateWithCustomRepository(): void
             'custom_form_class' => '\mock\Entity\CustomForm',
             'custom_form_proxy_class' => '\mock\Entity\NodesSourcesCustomForm',
             'repository_class' => '\mock\Entity\Repository\NodesSourcesRepository',
-            'namespace' => '\tests\mocks\GeneratedNodesSourcesWithRepository',
+            'namespace' => '\RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSourcesWithRepository',
             'use_native_json' => true,
             'use_api_platform_filters' => true,
         ]);
@@ -67,7 +67,7 @@ public function testCreateWithCustomRepository(): void
 //        );
 
         $this->assertEquals(
-            file_get_contents(dirname(__DIR__) . '/../tests/mocks/GeneratedNodesSourcesWithRepository/NSMock.php'),
+            file_get_contents(dirname(__DIR__) . '/tests/Mocks/GeneratedNodesSourcesWithRepository/NSMock.php'),
             $generator->createWithCustomRepository($this->getMockNodeType())->getClassContent()
         );
     }
@@ -83,7 +83,7 @@ public function testCreateCustomRepository(): void
             'custom_form_class' => '\mock\Entity\CustomForm',
             'custom_form_proxy_class' => '\mock\Entity\NodesSourcesCustomForm',
             'repository_class' => '\mock\Entity\Repository\NodesSourcesRepository',
-            'namespace' => '\tests\mocks\GeneratedNodesSourcesWithRepository',
+            'namespace' => '\RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSourcesWithRepository',
             'use_native_json' => true,
             'use_api_platform_filters' => true,
         ]);
@@ -97,7 +97,7 @@ public function testCreateCustomRepository(): void
 //        );
 
         $this->assertEquals(
-            file_get_contents(dirname(__DIR__) . '/../tests/mocks/GeneratedNodesSourcesWithRepository/NSMockRepository.php'),
+            file_get_contents(dirname(__DIR__) . '/tests/Mocks/GeneratedNodesSourcesWithRepository/Repository/NSMockRepository.php'),
             $generator->createCustomRepository($this->getMockNodeType())->getClassContent()
         );
     }

lib/EntityGenerator/src/Test/EntityGeneratorTest.php → lib/EntityGenerator/tests/EntityGeneratorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\EntityGenerator\Test;
+namespace RZ\Roadiz\EntityGenerator\Tests;
 
 use PHPUnit\Framework\TestCase;
 use RZ\Roadiz\Contracts\NodeType\NodeTypeInterface;
@@ -27,7 +27,7 @@ protected function getEntityGenerator(NodeTypeInterface $nodeType, ?array $optio
                 'custom_form_class' => '\mock\Entity\CustomForm',
                 'custom_form_proxy_class' => '\mock\Entity\NodesSourcesCustomForm',
                 'repository_class' => '\mock\Entity\Repository\NodesSourcesRepository',
-                'namespace' => '\tests\mocks\GeneratedNodesSources',
+                'namespace' => '\RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSources',
                 'use_native_json' => true,
                 'use_api_platform_filters' => true,
             ]
@@ -48,7 +48,7 @@ public function testGetClassContent(): void
 //        );
 
         $this->assertEquals(
-            file_get_contents(dirname(__DIR__) . '/../tests/mocks/GeneratedNodesSources/NSMock.php'),
+            file_get_contents(dirname(__DIR__) . '/tests/Mocks/GeneratedNodesSources/NSMock.php'),
             $generator->getClassContent()
         );
 
@@ -64,12 +64,12 @@ public function testGetClassContent(): void
             'custom_form_class' => 'mock\Entity\CustomForm',
             'custom_form_proxy_class' => 'mock\Entity\NodesSourcesCustomForm',
             'repository_class' => 'mock\Entity\Repository\NodesSourcesRepository',
-            'namespace' => 'tests\mocks\GeneratedNodesSources',
+            'namespace' => 'RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSources',
             'use_native_json' => true,
             'use_api_platform_filters' => true,
         ]);
         $this->assertEquals(
-            file_get_contents(dirname(__DIR__) . '/../tests/mocks/GeneratedNodesSources/NSMock.php'),
+            file_get_contents(dirname(__DIR__) . '/tests/Mocks/GeneratedNodesSources/NSMock.php'),
             $generatorWithoutLeadingSlashes->getClassContent()
         );
     }

lib/EntityGenerator/src/Test/JoinedTableDefaultValuesResolver.php → lib/EntityGenerator/tests/JoinedTableDefaultValuesResolver.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace RZ\Roadiz\EntityGenerator\Test;
+namespace RZ\Roadiz\EntityGenerator\Tests;
 
 use RZ\Roadiz\Contracts\NodeType\NodeTypeFieldInterface;
 use RZ\Roadiz\EntityGenerator\Field\DefaultValuesResolverInterface;

lib/EntityGenerator/tests/mocks/GeneratedNodesSources/NSMock.php → lib/EntityGenerator/tests/Mocks/GeneratedNodesSources/NSMock.php

@@ -6,7 +6,7 @@
  * THIS IS A GENERATED FILE, DO NOT EDIT IT
  * IT WILL BE RECREATED AT EACH NODE-TYPE UPDATE
  */
-namespace tests\mocks\GeneratedNodesSources;
+namespace RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSources;
 
 use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;

lib/EntityGenerator/tests/mocks/GeneratedNodesSourcesWithRepository/NSMock.php → lib/EntityGenerator/tests/Mocks/GeneratedNodesSourcesWithRepository/NSMock.php

@@ -6,7 +6,7 @@
  * THIS IS A GENERATED FILE, DO NOT EDIT IT
  * IT WILL BE RECREATED AT EACH NODE-TYPE UPDATE
  */
-namespace tests\mocks\GeneratedNodesSourcesWithRepository;
+namespace RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSourcesWithRepository;
 
 use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation as Serializer;
@@ -22,7 +22,7 @@
  */
 #[
     Gedmo\Loggable(logEntryClass: \RZ\Roadiz\CoreBundle\Entity\UserLogEntry::class),
-    ORM\Entity(repositoryClass: \tests\mocks\GeneratedNodesSourcesWithRepository\Repository\NSMockRepository::class),
+    ORM\Entity(repositoryClass: \RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSourcesWithRepository\Repository\NSMockRepository::class),
     ORM\Table(name: "ns_mock"),
     ORM\Index(columns: ["foo_datetime"]),
     ORM\Index(columns: ["fooIndexed"]),