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

minor #33504 SCA: minor code tweaks (kalessil)

Browse Source 
This PR was squashed before being merged into the 3.4 branch (closes #33504).

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

Minor code tweaks: disabled sorting in glob (the order is not important there), used implode() negative index support in order to drop an array_pop() call.

Commits
-------

32ea449679 SCA: minor code tweaks
This commit is contained in:
Fabien Potencier 2019-09-08 19:26:35 +02:00
commit 6f332ce0e0
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
View File

@ -260,11 +260,11 @@ abstract class AbstractDoctrineExtension extends Extension
$configPath = $this->getMappingResourceConfigDirectory(); $configPath = $this->getMappingResourceConfigDirectory();
$extension = $this->getMappingResourceExtension(); $extension = $this->getMappingResourceExtension();
if (glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) { if (glob($dir.'/'.$configPath.'/*.'.$extension.'.xml', GLOB_NOSORT)) {
$driver = 'xml'; $driver = 'xml';
} elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.yml')) { } elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.yml', GLOB_NOSORT)) {
$driver = 'yml'; $driver = 'yml';
} elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.php')) { } elseif (glob($dir.'/'.$configPath.'/*.'.$extension.'.php', GLOB_NOSORT)) {
$driver = 'php'; $driver = 'php';
} else { } else {
// add the closest existing directory as a resource // add the closest existing directory as a resource

3
src/Symfony/Component/Console/Application.php
View File

@ -1098,8 +1098,7 @@ class Application
*/ */
public function extractNamespace($name, $limit = null) public function extractNamespace($name, $limit = null)
{ {
$parts = explode(':', $name); $parts = explode(':', $name, -1);
array_pop($parts);
return implode(':', null === $limit ? $parts : \array_slice($parts, 0, $limit)); return implode(':', null === $limit ? $parts : \array_slice($parts, 0, $limit));
} }

2
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -673,7 +673,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
static $legacyContainers = []; static $legacyContainers = [];
$oldContainerDir = \dirname($oldContainer->getFileName()); $oldContainerDir = \dirname($oldContainer->getFileName());
$legacyContainers[$oldContainerDir.'.legacy'] = true; $legacyContainers[$oldContainerDir.'.legacy'] = true;
foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy') as $legacyContainer) { foreach (glob(\dirname($oldContainerDir).\DIRECTORY_SEPARATOR.'*.legacy', GLOB_NOSORT) as $legacyContainer) {
if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) { if (!isset($legacyContainers[$legacyContainer]) && @unlink($legacyContainer)) {
(new Filesystem())->remove(substr($legacyContainer, 0, -7)); (new Filesystem())->remove(substr($legacyContainer, 0, -7));
} }

2
src/Symfony/Component/Intl/Data/Util/LocaleScanner.php
View File

@ -42,7 +42,7 @@ class LocaleScanner
*/ */
public function scanLocales($sourceDir) public function scanLocales($sourceDir)
{ {
$locales = glob($sourceDir.'/*.txt'); $locales = glob($sourceDir.'/*.txt', GLOB_NOSORT);
// Remove file extension and sort // Remove file extension and sort
array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); }); array_walk($locales, function (&$locale) { $locale = basename($locale, '.txt'); });