minor #28994 SCA: minor code tweaks (vladimir.reznichenko, kalessil)
This PR was merged into the 3.4 branch. Discussion ---------- SCA: minor code tweaks | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Following tweaks included: - repetitive method calls - greedy regex - unnecessary function calls (simplifications) Commits -------b12c89d481
SCA: fixed broken tests42e96ff7a2
SCA: applied code style as per guidelines8dbd927a33
SCA: minor code tweaks
This commit is contained in:
commit
555f2d922e
@ -881,12 +881,9 @@ class FrameworkExtension extends Extension
|
|||||||
if ($config['formats']) {
|
if ($config['formats']) {
|
||||||
$loader->load('request.xml');
|
$loader->load('request.xml');
|
||||||
|
|
||||||
$container->getDefinition('request.add_request_formats_listener')->setPrivate(true);
|
$listener = $container->getDefinition('request.add_request_formats_listener');
|
||||||
|
$listener->setPrivate(true);
|
||||||
$container
|
$listener->replaceArgument(0, $config['formats']);
|
||||||
->getDefinition('request.add_request_formats_listener')
|
|
||||||
->replaceArgument(0, $config['formats'])
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -240,7 +240,7 @@ class XmlUtils
|
|||||||
return '0x' === $value[0].$value[1] ? hexdec($value) : (float) $value;
|
return '0x' === $value[0].$value[1] ? hexdec($value) : (float) $value;
|
||||||
case preg_match('/^0x[0-9a-f]++$/i', $value):
|
case preg_match('/^0x[0-9a-f]++$/i', $value):
|
||||||
return hexdec($value);
|
return hexdec($value);
|
||||||
case preg_match('/^(-|\+)?[0-9]+(\.[0-9]+)?$/', $value):
|
case preg_match('/^[+-]?[0-9]+(\.[0-9]+)?$/', $value):
|
||||||
return (float) $value;
|
return (float) $value;
|
||||||
default:
|
default:
|
||||||
return $value;
|
return $value;
|
||||||
|
@ -635,9 +635,9 @@ class XmlFileLoaderTest extends TestCase
|
|||||||
$resources = $container->getResources();
|
$resources = $container->getResources();
|
||||||
|
|
||||||
$fixturesDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
|
$fixturesDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
|
||||||
$this->assertTrue(false !== array_search(new FileResource($fixturesDir.'xml'.\DIRECTORY_SEPARATOR.'services_prototype.xml'), $resources));
|
|
||||||
$this->assertTrue(false !== array_search(new GlobResource($fixturesDir.'Prototype', '/*', true), $resources));
|
|
||||||
$resources = array_map('strval', $resources);
|
$resources = array_map('strval', $resources);
|
||||||
|
$this->assertContains((string) (new FileResource($fixturesDir.'xml'.\DIRECTORY_SEPARATOR.'services_prototype.xml')), $resources);
|
||||||
|
$this->assertContains((string) (new GlobResource($fixturesDir.'Prototype', '/*', true)), $resources);
|
||||||
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo', $resources);
|
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo', $resources);
|
||||||
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar', $resources);
|
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar', $resources);
|
||||||
}
|
}
|
||||||
|
@ -394,9 +394,9 @@ class YamlFileLoaderTest extends TestCase
|
|||||||
$resources = $container->getResources();
|
$resources = $container->getResources();
|
||||||
|
|
||||||
$fixturesDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
|
$fixturesDir = \dirname(__DIR__).\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
|
||||||
$this->assertTrue(false !== array_search(new FileResource($fixturesDir.'yaml'.\DIRECTORY_SEPARATOR.'services_prototype.yml'), $resources));
|
|
||||||
$this->assertTrue(false !== array_search(new GlobResource($fixturesDir.'Prototype', '', true), $resources));
|
|
||||||
$resources = array_map('strval', $resources);
|
$resources = array_map('strval', $resources);
|
||||||
|
$this->assertContains((string) (new FileResource($fixturesDir.'yaml'.\DIRECTORY_SEPARATOR.'services_prototype.yml')), $resources);
|
||||||
|
$this->assertContains((string) (new GlobResource($fixturesDir.'Prototype', '', true)), $resources);
|
||||||
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo', $resources);
|
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo', $resources);
|
||||||
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar', $resources);
|
$this->assertContains('reflection.Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar', $resources);
|
||||||
}
|
}
|
||||||
|
@ -974,7 +974,7 @@ class Response
|
|||||||
public function setCache(array $options)
|
public function setCache(array $options)
|
||||||
{
|
{
|
||||||
if ($diff = array_diff(array_keys($options), array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'))) {
|
if ($diff = array_diff(array_keys($options), array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public', 'immutable'))) {
|
||||||
throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', array_values($diff))));
|
throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', $diff)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($options['etag'])) {
|
if (isset($options['etag'])) {
|
||||||
|
Reference in New Issue
Block a user