Merge pull request #273 from oliverklee/cleanup/directory-separator

Author: sabberworm

tests/ParserTest.php

@@ -37,7 +37,7 @@ public function testFiles()
                     // or a future test of a as-of-now missing feature
                     continue;
                 }
-                $oParser = new Parser(file_get_contents($sDirectory . DIRECTORY_SEPARATOR . $sFileName));
+                $oParser = new Parser(file_get_contents($sDirectory . '/' . $sFileName));
                 try {
                     $this->assertNotEquals('', $oParser->parse()->render());
                 } catch (\Exception $e) {
@@ -807,7 +807,7 @@ public function testMissingPropertyValueLenient()
      */
     private function parsedStructureForFile($sFileName, $oSettings = null)
     {
-        $sFile = __DIR__ . '/fixtures' . DIRECTORY_SEPARATOR . "$sFileName.css";
+        $sFile = __DIR__ . "/fixtures/$sFileName.css";
         $oParser = new Parser(file_get_contents($sFile), $oSettings);
         return $oParser->parse();
     }

tests/RuleSet/LenientParsingTest.php

@@ -13,14 +13,14 @@ class LenientParsingTest extends \PHPUnit\Framework\TestCase
      */
     public function testFaultToleranceOff()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+        $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
 
     public function testFaultToleranceOn()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+        $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame(
@@ -35,7 +35,7 @@ public function testFaultToleranceOn()
      */
     public function testEndToken()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
@@ -45,22 +45,22 @@ public function testEndToken()
      */
     public function testEndToken2()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token-2.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
         $oParser->parse();
     }
 
     public function testEndTokenPositive()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame("", $oResult->render());
     }
 
     public function testEndToken2Positive()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css";
+        $sFile = __DIR__ . '/../fixtures/-end-token-2.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame(
@@ -72,7 +72,7 @@ public function testEndToken2Positive()
     public function testLocaleTrap()
     {
         setlocale(LC_ALL, "pt_PT", "no");
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
+        $sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
         $oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
         $oResult = $oParser->parse();
         $this->assertSame(
@@ -84,7 +84,7 @@ public function testLocaleTrap()
 
     public function testCaseInsensitivity()
     {
-        $sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "case-insensitivity.css";
+        $sFile = __DIR__ . '/../fixtures/case-insensitivity.css';
         $oParser = new Parser(file_get_contents($sFile));
         $oResult = $oParser->parse();