feat: Big roadiz/documents namespace refactoring

roadiz · Nov 23, 2022 · 02dfbb5 · 02dfbb5
1 parent 9a1e449
commit 02dfbb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 
 test:
+	vendor/bin/atoum -d ./lib/Documents/tests
 	#php -d "memory_limit=-1" vendor/bin/phpcs --report=full --report-file=./report.txt -p ./src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCoreBundle/src
 	php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCompatBundle/src

diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
         "ext-dom": "*",
         "ext-simplexml": "*",
         "ext-fileinfo": "*",
+        "ext-gd": "*",
         "api-platform/core": "~2.7.0",
         "composer/package-versions-deprecated": "1.11.99.3",
         "doctrine/annotations": "^1.0",
@@ -78,6 +79,7 @@
         "twig/twig": "^2.12|^3.0"
     },
     "require-dev": {
+        "atoum/atoum": "^4.0.0",
         "enshrined/svg-sanitize": "^0.15",
         "php-coveralls/php-coveralls": "^2.4",
         "phpoffice/phpspreadsheet": "^1.15",
@@ -126,21 +128,10 @@
         "psr-4": {
             "App\\": "src/",
             "RZ\\Roadiz\\Bag\\": "lib/Models/src/Roadiz/Bag/",
-            "RZ\\Roadiz\\Core\\": [
-                "lib/Models/src/Roadiz/Core/",
-                "lib/Documents/src/Roadiz/Core/"
-            ],
-            "RZ\\Roadiz\\Utils\\": [
-                "lib/Models/src/Roadiz/Utils/",
-                "lib/Documents/src/Roadiz/Utils/"
-            ],
-            "RZ\\Roadiz\\TwigExtension\\": [
-                "lib/Documents/src/Roadiz/TwigExtension/"
-            ],
-            "RZ\\Roadiz\\Document\\": [
-                "lib/Documents/src/Roadiz/Document/"
-            ],
+            "RZ\\Roadiz\\Core\\": "lib/Models/src/Roadiz/Core/",
+            "RZ\\Roadiz\\Utils\\": "lib/Models/src/Roadiz/Utils/",
             "RZ\\Roadiz\\CoreBundle\\": "lib/RoadizCoreBundle/src/",
+            "RZ\\Roadiz\\Documents\\": "lib/Documents/src/",
             "RZ\\Roadiz\\CompatBundle\\": "lib/RoadizCompatBundle/src/",
             "RZ\\Roadiz\\RozierBundle\\": "lib/RoadizRozierBundle/src/",
             "RZ\\Roadiz\\UserBundle\\": "lib/RoadizUserBundle/src/",