Skip to content

Commit 79f3006

Browse files
committed
Stop using DIRECTORY_SEPARATOR in the tests
In the affected cases, we are already using forward slashes, and hence can use them all the time.
1 parent d9fc105 commit 79f3006

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

tests/ParserTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testFiles()
3737
// or a future test of a as-of-now missing feature
3838
continue;
3939
}
40-
$oParser = new Parser(file_get_contents($sDirectory . DIRECTORY_SEPARATOR . $sFileName));
40+
$oParser = new Parser(file_get_contents($sDirectory . '/' . $sFileName));
4141
try {
4242
$this->assertNotEquals('', $oParser->parse()->render());
4343
} catch (\Exception $e) {
@@ -807,7 +807,7 @@ public function testMissingPropertyValueLenient()
807807
*/
808808
private function parsedStructureForFile($sFileName, $oSettings = null)
809809
{
810-
$sFile = __DIR__ . '/fixtures' . DIRECTORY_SEPARATOR . "$sFileName.css";
810+
$sFile = __DIR__ . "/fixtures/$sFileName.css";
811811
$oParser = new Parser(file_get_contents($sFile), $oSettings);
812812
return $oParser->parse();
813813
}

tests/RuleSet/LenientParsingTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ class LenientParsingTest extends \PHPUnit\Framework\TestCase
1313
*/
1414
public function testFaultToleranceOff()
1515
{
16-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
16+
$sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
1717
$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
1818
$oParser->parse();
1919
}
2020

2121
public function testFaultToleranceOn()
2222
{
23-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
23+
$sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
2424
$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
2525
$oResult = $oParser->parse();
2626
$this->assertSame(
@@ -35,7 +35,7 @@ public function testFaultToleranceOn()
3535
*/
3636
public function testEndToken()
3737
{
38-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css";
38+
$sFile = __DIR__ . '/../fixtures/-end-token.css';
3939
$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
4040
$oParser->parse();
4141
}
@@ -45,22 +45,22 @@ public function testEndToken()
4545
*/
4646
public function testEndToken2()
4747
{
48-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css";
48+
$sFile = __DIR__ . '/../fixtures/-end-token-2.css';
4949
$oParser = new Parser(file_get_contents($sFile), Settings::create()->beStrict());
5050
$oParser->parse();
5151
}
5252

5353
public function testEndTokenPositive()
5454
{
55-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token.css";
55+
$sFile = __DIR__ . '/../fixtures/-end-token.css';
5656
$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
5757
$oResult = $oParser->parse();
5858
$this->assertSame("", $oResult->render());
5959
}
6060

6161
public function testEndToken2Positive()
6262
{
63-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-end-token-2.css";
63+
$sFile = __DIR__ . '/../fixtures/-end-token-2.css';
6464
$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
6565
$oResult = $oParser->parse();
6666
$this->assertSame(
@@ -72,7 +72,7 @@ public function testEndToken2Positive()
7272
public function testLocaleTrap()
7373
{
7474
setlocale(LC_ALL, "pt_PT", "no");
75-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "-fault-tolerance.css";
75+
$sFile = __DIR__ . '/../fixtures/-fault-tolerance.css';
7676
$oParser = new Parser(file_get_contents($sFile), Settings::create()->withLenientParsing(true));
7777
$oResult = $oParser->parse();
7878
$this->assertSame(
@@ -84,7 +84,7 @@ public function testLocaleTrap()
8484

8585
public function testCaseInsensitivity()
8686
{
87-
$sFile = __DIR__ . '/../fixtures' . DIRECTORY_SEPARATOR . "case-insensitivity.css";
87+
$sFile = __DIR__ . '/../fixtures/case-insensitivity.css';
8888
$oParser = new Parser(file_get_contents($sFile));
8989
$oResult = $oParser->parse();
9090

0 commit comments

Comments
 (0)