fix provider to treat path always as directory

Runalyze · Aug 26, 2016 · d75f371 · d75f371
1 parent 59abba0
commit d75f371
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Provider/AbstractFileProvider.php b/src/Provider/AbstractFileProvider.php
@@ -48,9 +48,17 @@ public function __construct($pathToFiles, InterpolationInterface $interpolation
         $this->PathToFiles = $pathToFiles;
         $this->Interpolation = $interpolation;
 
+        $this->addSlashToPathIfNotThere();
         $this->initResourceReader();
     }
 
+    private function addSlashToPathIfNotThere()
+    {
+        if (substr($this->PathToFiles, -1) != '/') {
+            $this->PathToFiles .= '/';
+        }
+    }
+
     /**
      * @param InterpolationInterface $interpolation
      */

diff --git a/src/Tests/Provider/GeoTIFF/SRTM4ProviderTest.php b/src/Tests/Provider/GeoTIFF/SRTM4ProviderTest.php
@@ -17,7 +17,7 @@
 class SRTM4ProviderTest extends \PHPUnit_Framework_TestCase
 {
     /** @var string */
-    const PATH_TO_FILES = '/../../../../tests/testfiles/';
+    const PATH_TO_FILES = '/../../../../tests/testfiles';
 
     /**
      * @var SRTM4Provider
@@ -46,7 +46,7 @@ protected function checkFile($filename)
      */
     protected function fileIsThere($filename)
     {
-        return file_exists(__DIR__.self::PATH_TO_FILES.$filename);
+        return file_exists(__DIR__.self::PATH_TO_FILES.'/'.$filename);
     }
 
     public function testThatLocationOutOfBoundsIsRecognized()