Skip to content

Commit 9749930

Browse files
Merge branch '2.8' into 3.4
* 2.8: Enable native_constant_invocation CS fixer
2 parents e9e3815 + 12ad0a7 commit 9749930

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Loader/XliffFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private function fixXmlLocation($schemaSource, $xmlUri)
247247
}
248248
}
249249

250-
$drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
250+
$drive = '\\' === \DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
251251
$newPath = $locationstart.$drive.implode('/', array_map('rawurlencode', $parts));
252252

253253
return str_replace($xmlUri, $newPath, $schemaSource);

Tests/TranslatorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,12 @@ public function testFallbackCatalogueResources()
297297

298298
$resources = $translator->getCatalogue('en')->getResources();
299299
$this->assertCount(1, $resources);
300-
$this->assertContains(__DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'resources.yml', $resources);
300+
$this->assertContains(__DIR__.\DIRECTORY_SEPARATOR.'fixtures'.\DIRECTORY_SEPARATOR.'resources.yml', $resources);
301301

302302
$resources = $translator->getCatalogue('en_GB')->getResources();
303303
$this->assertCount(2, $resources);
304-
$this->assertContains(__DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'empty.yml', $resources);
305-
$this->assertContains(__DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'resources.yml', $resources);
304+
$this->assertContains(__DIR__.\DIRECTORY_SEPARATOR.'fixtures'.\DIRECTORY_SEPARATOR.'empty.yml', $resources);
305+
$this->assertContains(__DIR__.\DIRECTORY_SEPARATOR.'fixtures'.\DIRECTORY_SEPARATOR.'resources.yml', $resources);
306306
}
307307

308308
/**

0 commit comments

Comments
 (0)