Merge pull request #83 from phug-php/fix/non-psr4-files

Move compatibility TestCase files outside the autoload folder
phug-php · May 22, 2021 · 1e19e5b · 1e19e5b
2 parents 02f4e17 + 7c6ee98
commit 1e19e5b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -66,9 +66,9 @@
                 "./src/Phug/Lexer/",
                 "./src/Phug/Parser/",
                 "./src/Phug/Reader/",
-                "./src/Phug/Renderer/",
-                "./src/Phug/Util/"
-            ]
+                "./src/Phug/Renderer/"
+            ],
+            "Phug\\Util\\": "./src/Phug/Util/Util/"
         }
     },
     "autoload-dev": {

diff --git a/phpcs.xml b/phpcs.xml
@@ -4,8 +4,8 @@
         <exclude-pattern>*.js</exclude-pattern>
         <exclude-pattern>*/src/Phug/Renderer/Renderer/Adapter/Stream/Template.php</exclude-pattern>
         <exclude-pattern>*/src/Phug/Util/Util/TestCase.php</exclude-pattern>
-        <exclude-pattern>*/src/Phug/Util/Util/TestCaseTyped.php</exclude-pattern>
-        <exclude-pattern>*/src/Phug/Util/Util/TestCaseUntyped.php</exclude-pattern>
+        <exclude-pattern>*/src/Phug/Util/CompatibilityUtil/TestCaseTyped.php</exclude-pattern>
+        <exclude-pattern>*/src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php</exclude-pattern>
     </rule>
     <file>src</file>
 </ruleset>
diff --git a/src/Phug/Util/.travis.yml b/src/Phug/Util/.travis.yml
@@ -21,6 +21,7 @@ install:
     if [[ "$STYLECHECK" != "on" ]]; then
       mkdir -p tests/Phug && \
       vendor/bin/split copy https://github.com/phug-php/phug.git tests/Phug/ --filters=tests/Phug/Util;
+      vendor/bin/split copy https://github.com/phug-php/phug.git compatibility;
     fi;
 
 script:

diff --git a/src/Phug/Util/Util/TestCaseTyped.php → .../Util/CompatibilityUtil/TestCaseTyped.php b/src/Phug/Util/Util/TestCaseTyped.php → .../Util/CompatibilityUtil/TestCaseTyped.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phug\Util;
+namespace Phug\CompatibilityUtil;
 
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 

diff --git a/src/Phug/Util/Util/TestCaseUntyped.php → ...til/CompatibilityUtil/TestCaseUntyped.php b/src/Phug/Util/Util/TestCaseUntyped.php → ...til/CompatibilityUtil/TestCaseUntyped.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Phug\Util;
+namespace Phug\CompatibilityUtil;
 
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 

diff --git a/src/Phug/Util/README.md b/src/Phug/Util/README.md
@@ -2,7 +2,7 @@
 Phug Util
 =========
 
-What is Phug Lexer?
+What is Phug Util?
 -------------------
 
 The Phug Util repository contains several utilities to be used in conjunction with Phug libraries.

diff --git a/src/Phug/Util/Util/TestCase.php b/src/Phug/Util/Util/TestCase.php
@@ -3,16 +3,19 @@
 namespace Phug\Util;
 
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+use Phug\CompatibilityUtil\TestCaseTypeBase;
 use ReflectionMethod;
 
-$setUp = @new ReflectionMethod(PHPUnitTestCase::class, 'setUp');
-$testCaseInitialization = true;
+if (!class_exists(TestCaseTypeBase::class)) {
+    $setUp = @new ReflectionMethod(PHPUnitTestCase::class, 'setUp');
+    $testCaseInitialization = true;
 
-require $setUp && method_exists($setUp, 'hasReturnType') && $setUp->hasReturnType()
-    ? __DIR__.'/TestCaseTyped.php'
-    : __DIR__.'/TestCaseUntyped.php';
+    require $setUp && method_exists($setUp, 'hasReturnType') && $setUp->hasReturnType()
+        ? __DIR__.'/../CompatibilityUtil/TestCaseTyped.php'
+        : __DIR__.'/../CompatibilityUtil/TestCaseUntyped.php';
 
-unset($testCaseInitialization);
+    unset($testCaseInitialization);
+}
 
 class TestCase extends TestCaseTypeBase
 {

diff --git a/src/Phug/Util/composer.json b/src/Phug/Util/composer.json
@@ -29,7 +29,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Phug\\": ""
+            "Phug\\Util\\": "Util/"
         }
     },
     "extra": {