diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] SCA

Browse Source
This commit is contained in:
Vladimir Reznichenko 2018-06-17 21:23:55 +02:00 committed by Nicolas Grekas
parent 4cec0e1260
commit 5922507dc5
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
View File

@ -208,9 +208,7 @@ class DoctrineExtensionTest extends TestCase
$definition = $container->getDefinition('doctrine.orm.default_metadata_cache');
$defCalls = $definition->getMethodCalls();
$expectedCalls[] = 'setNamespace';
$actualCalls = array_map(function ($call) {
return $call[0];
}, $defCalls);
$actualCalls = array_column($defCalls, 0);
$this->assertFalse($definition->isPublic());
$this->assertEquals("%$class%", $definition->getClass());

2
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
View File

@ -316,7 +316,7 @@ class TextDescriptor extends Descriptor
}
if ($definition->getFile()) {
$tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');
$tableRows[] = array('Required File', $definition->getFile() ?: '-');
}
if ($factory = $definition->getFactory()) {

2
src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
View File

@ -86,7 +86,7 @@ class UserPasswordEncoderCommandTest extends WebTestCase
$this->assertContains('Password encoding succeeded', $output);
$encoder = new Argon2iPasswordEncoder();
preg_match('# Encoded password\s+(\$argon2id?\$[\w\d,=\$+\/]+={0,2})\s+#', $output, $matches);
preg_match('# Encoded password\s+(\$argon2id?\$[\w,=\$+\/]+={0,2})\s+#', $output, $matches);
$hash = $matches[1];
$this->assertTrue($encoder->isPasswordValid($hash, 'password', null));
}

2
src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
View File

@ -123,7 +123,7 @@ class IntegrationTest extends TestCase
public function testYamlContainerCompiles($directory, $actualServiceId, $expectedServiceId, ContainerBuilder $mainContainer = null)
{
// allow a container to be passed in, which might have autoconfigure settings
$container = $mainContainer ? $mainContainer : new ContainerBuilder();
$container = $mainContainer ?: new ContainerBuilder();
$container->setResourceTracking(false);
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Fixtures/yaml/integration/'.$directory));
$loader->load('main.yml');

4
src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php
View File

@ -157,9 +157,7 @@ class LanguageDataGenerator extends AbstractDataGenerator
return array(
'Version' => $rootBundle['Version'],
'Languages' => $this->languageCodes,
'Aliases' => array_map(function (\ResourceBundle $bundle) {
return $bundle['replacement'];
}, iterator_to_array($metadataBundle['alias']['language'])),
'Aliases' => array_column(iterator_to_array($metadataBundle['alias']['language']), 'replacement'),
'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
);
}

2
src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
View File

@ -145,7 +145,7 @@ class Connection extends AbstractConnection
private function disconnect()
{
if ($this->connection && is_resource($this->connection)) {
ldap_close($this->connection);
ldap_unbind($this->connection);
}
$this->connection = null;