Merge pull request #28 from phug-php/allow-extension-redundancy

Allow extension redundancy

Author: kylekatarnls

.multi-tester.yml

@@ -0,0 +1,28 @@
+phug/renderer:
+  script: vendor/bin/phpunit -c ./vendor/phug/dev-tool/config/
+
+phug/phug:
+  script: vendor/bin/phpunit -c ./vendor/phug/dev-tool/config/
+
+pug-php/pug: default
+
+pug/bemto: default
+
+pug-php/pug-assets: default
+
+pug-php/pug-minify: default
+
+pug/slim: default
+
+pug/twig:
+  script: vendor/bin/phpunit -c ./vendor/phug/dev-tool/config/
+
+ci-pug/ci-pug: default
+
+bkwld/laravel-pug:
+  install:
+    - php tests/setDependenciesVersions.php 5.8.* ^3.0
+    - composer update --no-interaction
+  script: LARAVEL_VERSION=5.8 ./vendor/bin/phpunit --no-coverage
+
+pug/yii2: default

.travis.yml

@@ -4,21 +4,26 @@ language: php
 git:
   depth: 5
 
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
+matrix:
+  include:
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.3
+      env: MULTITEST='on'
 
 install:
   - travis_retry composer clear-cache
+  - if [ "$MULTITEST" = "on" ]; then composer require --no-update kylekatarnls/multi-tester; fi;
   - travis_retry composer self-update
   - travis_retry composer install
 
 script:
-  - vendor/bin/phug-dev check --report --coverage-php-version=5.6
+  - if [ "$MULTITEST" != "on" ]; then vendor/bin/phug-dev check --report --coverage-php-version=5.6; fi;
+  - if [ "$MULTITEST" = "on" ]; then vendor/bin/multi-tester --verbose; fi;
 
 notifications:
   slack: phug:nzXFnxhU14RWK2EQSDL0u08z

src/Phug/Compiler/Locator/FileLocator.php

@@ -11,6 +11,25 @@ private function normalize($path)
         return rtrim(str_replace('\\', '/', $path), '/');
     }
 
+    private function getFullPath($location, $path, $extension)
+    {
+        $fullPath = "$location/$path$extension";
+
+        if (@is_file($fullPath) && is_readable($fullPath)) {
+            return realpath($fullPath);
+        }
+
+        $length = strlen($extension);
+
+        if ($length && substr($path, $length) === $extension &&
+            @is_file($fullPath = "$location/$path") && is_readable($fullPath)
+        ) {
+            return realpath($fullPath);
+        }
+
+        return null;
+    }
+
     public function locate($path, array $locations, array $extensions)
     {
         // @ catch softly PHP open_basedir restriction
@@ -25,10 +44,8 @@ public function locate($path, array $locations, array $extensions)
             $location = $this->normalize($location);
 
             foreach ($extensions as $extension) {
-                $fullPath = "$location/$path$extension";
-
-                if (@is_file($fullPath) && is_readable($fullPath)) {
-                    return realpath($fullPath);
+                if ($fullPath = $this->getFullPath($location, $path, $extension)) {
+                    return $fullPath;
                 }
             }
         }

tests/Phug/Compiler/Locator/FileLocatorTest.php

@@ -12,6 +12,7 @@ class FileLocatorTest extends AbstractCompilerTest
 {
     /**
      * @covers ::normalize
+     * @covers ::getFullPath
      * @covers ::<public>
      */
     public function testLocate()
@@ -27,6 +28,10 @@ public function testLocate()
             '/views/base.pug',
             str_replace('\\', '/', $locator->locate('base', $paths, $extensions))
         );
+        self::assertStringEndsWith(
+            '/views/base.pug',
+            str_replace('\\', '/', $locator->locate('base.pug', $paths, $extensions))
+        );
 
         self::assertFileExists($locator->locate('../layouts/base', $paths, $extensions));
         self::assertStringEndsWith(