Skip to content

Commit ad2446d

Browse files
Enable native_constant_invocation CS fixer
1 parent d079279 commit ad2446d

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Dumper/PhpDumper.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function dump(array $options = array())
111111
// but every other sub-dir is optional up to the full path in $dir
112112
// Mandate at least 2 root dirs and not more that 5 optional dirs.
113113

114-
$dir = explode(DIRECTORY_SEPARATOR, realpath($dir));
114+
$dir = explode(\DIRECTORY_SEPARATOR, realpath($dir));
115115
$i = \count($dir);
116116

117117
if (3 <= $i) {
@@ -120,11 +120,11 @@ public function dump(array $options = array())
120120
$this->targetDirMaxMatches = $i - $lastOptionalDir;
121121

122122
while (--$i >= $lastOptionalDir) {
123-
$regex = sprintf('(%s%s)?', preg_quote(DIRECTORY_SEPARATOR.$dir[$i], '#'), $regex);
123+
$regex = sprintf('(%s%s)?', preg_quote(\DIRECTORY_SEPARATOR.$dir[$i], '#'), $regex);
124124
}
125125

126126
do {
127-
$regex = preg_quote(DIRECTORY_SEPARATOR.$dir[$i], '#').$regex;
127+
$regex = preg_quote(\DIRECTORY_SEPARATOR.$dir[$i], '#').$regex;
128128
} while (0 < --$i);
129129

130130
$this->targetDirRegex = '#'.preg_quote($dir[0], '#').$regex.'#';

Loader/XmlFileLoader.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ public function validateSchema(\DOMDocument $dom)
495495
$locationstart = 'phar:///';
496496
}
497497
}
498-
$drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
498+
$drive = '\\' === \DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
499499
$location = $locationstart.$drive.implode('/', array_map('rawurlencode', $parts));
500500

501501
$imports .= sprintf(' <xsd:import namespace="%s" schemaLocation="%s" />'."\n", $namespace, $location);

Tests/Dumper/PhpDumperTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ public function testAddService()
119119
// without compilation
120120
$container = include self::$fixturesPath.'/containers/container9.php';
121121
$dumper = new PhpDumper($container);
122-
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services9.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
122+
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services9.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
123123

124124
// with compilation
125125
$container = include self::$fixturesPath.'/containers/container9.php';
126126
$container->compile();
127127
$dumper = new PhpDumper($container);
128-
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services9_compiled.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
128+
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services9_compiled.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
129129

130130
$dumper = new PhpDumper($container = new ContainerBuilder());
131131
$container->register('foo', 'FooClass')->addArgument(new \stdClass());
@@ -145,7 +145,7 @@ public function testLegacySynchronizedServices()
145145
{
146146
$container = include self::$fixturesPath.'/containers/container20.php';
147147
$dumper = new PhpDumper($container);
148-
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services20.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
148+
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services20.php', str_replace(str_replace('\\', '\\\\', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR), '%path%', $dumper->dump()), '->dump() dumps services');
149149
}
150150

151151
public function testServicesWithAnonymousFactories()

Tests/Dumper/XmlDumperTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testLegacyAddService()
5353
$container = include self::$fixturesPath.'/containers/legacy-container9.php';
5454
$dumper = new XmlDumper($container);
5555

56-
$this->assertEquals(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/xml/legacy-services9.xml')), $dumper->dump(), '->dump() dumps services');
56+
$this->assertEquals(str_replace('%path%', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/xml/legacy-services9.xml')), $dumper->dump(), '->dump() dumps services');
5757

5858
$dumper = new XmlDumper($container = new ContainerBuilder());
5959
$container->register('foo', 'FooClass')->addArgument(new \stdClass());
@@ -71,7 +71,7 @@ public function testAddService()
7171
$container = include self::$fixturesPath.'/containers/container9.php';
7272
$dumper = new XmlDumper($container);
7373

74-
$this->assertEquals(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/xml/services9.xml')), $dumper->dump(), '->dump() dumps services');
74+
$this->assertEquals(str_replace('%path%', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/xml/services9.xml')), $dumper->dump(), '->dump() dumps services');
7575

7676
$dumper = new XmlDumper($container = new ContainerBuilder());
7777
$container->register('foo', 'FooClass')->addArgument(new \stdClass());

Tests/Dumper/YamlDumperTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testLegacyAddService()
4949
$container = include self::$fixturesPath.'/containers/legacy-container9.php';
5050
$dumper = new YamlDumper($container);
5151

52-
$this->assertEquals(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/legacy-services9.yml')), $dumper->dump(), '->dump() dumps services');
52+
$this->assertEquals(str_replace('%path%', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/legacy-services9.yml')), $dumper->dump(), '->dump() dumps services');
5353

5454
$dumper = new YamlDumper($container = new ContainerBuilder());
5555
$container->register('foo', 'FooClass')->addArgument(new \stdClass());
@@ -66,7 +66,7 @@ public function testAddService()
6666
{
6767
$container = include self::$fixturesPath.'/containers/container9.php';
6868
$dumper = new YamlDumper($container);
69-
$this->assertEqualYamlStructure(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/services9.yml')), $dumper->dump(), '->dump() dumps services');
69+
$this->assertEqualYamlStructure(str_replace('%path%', self::$fixturesPath.\DIRECTORY_SEPARATOR.'includes'.\DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/services9.yml')), $dumper->dump(), '->dump() dumps services');
7070

7171
$dumper = new YamlDumper($container = new ContainerBuilder());
7272
$container->register('foo', 'FooClass')->addArgument(new \stdClass());

0 commit comments

Comments
 (0)