#328 nicer path for regexes.php

tobie · Jan 19, 2014 · 4784230 · 4784230
1 parent fec0947
commit 4784230
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/php/src/UAParser/AbstractParser.php b/php/src/UAParser/AbstractParser.php
@@ -116,6 +116,8 @@ protected function replaceString($regex, $key, $string)
      */
     protected static function getDefaultFile()
     {
-        return static::$defaultFile ? static::$defaultFile : __DIR__ . '/../../resources/regexes.php';
+        return static::$defaultFile
+            ? static::$defaultFile
+            : realpath(__DIR__ . '/../../resources') . DIRECTORY_SEPARATOR . 'regexes.php';
     }
 }
diff --git a/php/tests/UAParser/Tests/AbstractParserTest.php b/php/tests/UAParser/Tests/AbstractParserTest.php
@@ -9,11 +9,7 @@
 namespace UAParser\Tests;
 
 use PHPUnit_Framework_TestCase as AbstractTestCase;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Finder\SplFileInfo;
-use Symfony\Component\Yaml\Yaml;
 use UAParser\AbstractParser;
-use UAParser\Parser;
 
 abstract class AbstractParserTest extends AbstractTestCase
 {
@@ -58,6 +54,15 @@ public function testExceptionOnFileNotFoundInvalidDefault()
         $parserClassName::create();
     }
 
+    public function testDefaultFileIsAbsolute()
+    {
+        $class = new \ReflectionClass('UAParser\AbstractParser');
+        $method = $class->getMethod('getDefaultFile');
+        $method->setAccessible(true);
+
+        $this->assertNotContains('..', $method->invoke(null));
+    }
+
     public function tearDown()
     {
         AbstractParser::$defaultFile = null;