Skip to content

Commit 8a4c162

Browse files
fabpotfabpot
committed
Merge branch '4.2' into short-array-master
* 4.2: fixed CS fixed CS fixed tests fixed CS fixed CS fixed CS fixed short array CS in comments fixed CS in ExpressionLanguage fixtures fixed CS in generated files fixed CS on generated container files fixed CS on Form PHP templates fixed CS on YAML fixtures fixed fixtures switched array() to []
2 parents 7c58a04 + 0bf225b commit 8a4c162

File tree

246 files changed

+2167
-2167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+2167
-2167
lines changed

‎CacheWarmer/AbstractPhpFileCacheWarmer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public function warmUp($cacheDir)
4646
{
4747
$arrayAdapter = new ArrayAdapter();
4848

49-
spl_autoload_register(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
49+
spl_autoload_register([PhpArrayAdapter::class, 'throwOnRequiredClass']);
5050
try {
5151
if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {
5252
return;
5353
}
5454
} finally {
55-
spl_autoload_unregister(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
55+
spl_autoload_unregister([PhpArrayAdapter::class, 'throwOnRequiredClass']);
5656
}
5757

5858
// the ArrayAdapter stores the values serialized

‎CacheWarmer/RouterCacheWarmer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public function isOptional()
6767
*/
6868
public static function getSubscribedServices()
6969
{
70-
return array(
70+
return [
7171
'router' => RouterInterface::class,
72-
);
72+
];
7373
}
7474
}

‎CacheWarmer/SerializerCacheWarmer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
7676
*/
7777
private function extractSupportedLoaders(array $loaders)
7878
{
79-
$supportedLoaders = array();
79+
$supportedLoaders = [];
8080

8181
foreach ($loaders as $loader) {
8282
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {

‎CacheWarmer/TemplateFinder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function findAllTemplates()
5252
return $this->templates;
5353
}
5454

55-
$templates = array();
55+
$templates = [];
5656

5757
foreach ($this->kernel->getBundles() as $bundle) {
5858
$templates = array_merge($templates, $this->findTemplatesInBundle($bundle));
@@ -72,7 +72,7 @@ public function findAllTemplates()
7272
*/
7373
private function findTemplatesInFolder($dir)
7474
{
75-
$templates = array();
75+
$templates = [];
7676

7777
if (is_dir($dir)) {
7878
$finder = new Finder();

‎CacheWarmer/TemplatePathsCacheWarmer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(TemplateFinderInterface $finder, TemplateLocator $lo
3939
public function warmUp($cacheDir)
4040
{
4141
$filesystem = new Filesystem();
42-
$templates = array();
42+
$templates = [];
4343

4444
foreach ($this->finder->findAllTemplates() as $template) {
4545
$templates[$template->getLogicalName()] = rtrim($filesystem->makePathRelative($this->locator->locate($template), $cacheDir), '/');

‎CacheWarmer/TranslationsCacheWarmer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public function isOptional()
6060
*/
6161
public static function getSubscribedServices()
6262
{
63-
return array(
63+
return [
6464
'translator' => TranslatorInterface::class,
65-
);
65+
];
6666
}
6767
}

‎CacheWarmer/ValidatorCacheWarmer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
8686
*/
8787
private function extractSupportedLoaders(array $loaders)
8888
{
89-
$supportedLoaders = array();
89+
$supportedLoaders = [];
9090

9191
foreach ($loaders as $loader) {
9292
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {

‎Client.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Client extends BaseClient
3434
/**
3535
* {@inheritdoc}
3636
*/
37-
public function __construct(KernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
37+
public function __construct(KernelInterface $kernel, array $server = [], History $history = null, CookieJar $cookieJar = null)
3838
{
3939
parent::__construct($kernel, $server, $history, $cookieJar);
4040
}

‎Command/AboutCommand.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,44 +61,44 @@ protected function execute(InputInterface $input, OutputInterface $output)
6161
/** @var KernelInterface $kernel */
6262
$kernel = $this->getApplication()->getKernel();
6363

64-
$rows = array(
65-
array('<info>Symfony</>'),
64+
$rows = [
65+
['<info>Symfony</>'],
6666
new TableSeparator(),
67-
array('Version', Kernel::VERSION),
68-
array('End of maintenance', Kernel::END_OF_MAINTENANCE.(self::isExpired(Kernel::END_OF_MAINTENANCE) ? ' <error>Expired</>' : '')),
69-
array('End of life', Kernel::END_OF_LIFE.(self::isExpired(Kernel::END_OF_LIFE) ? ' <error>Expired</>' : '')),
67+
['Version', Kernel::VERSION],
68+
['End of maintenance', Kernel::END_OF_MAINTENANCE.(self::isExpired(Kernel::END_OF_MAINTENANCE) ? ' <error>Expired</>' : '')],
69+
['End of life', Kernel::END_OF_LIFE.(self::isExpired(Kernel::END_OF_LIFE) ? ' <error>Expired</>' : '')],
7070
new TableSeparator(),
71-
array('<info>Kernel</>'),
71+
['<info>Kernel</>'],
7272
new TableSeparator(),
73-
array('Type', \get_class($kernel)),
74-
array('Environment', $kernel->getEnvironment()),
75-
array('Debug', $kernel->isDebug() ? 'true' : 'false'),
76-
array('Charset', $kernel->getCharset()),
77-
array('Cache directory', self::formatPath($kernel->getCacheDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getCacheDir()).'</>)'),
78-
array('Log directory', self::formatPath($kernel->getLogDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getLogDir()).'</>)'),
73+
['Type', \get_class($kernel)],
74+
['Environment', $kernel->getEnvironment()],
75+
['Debug', $kernel->isDebug() ? 'true' : 'false'],
76+
['Charset', $kernel->getCharset()],
77+
['Cache directory', self::formatPath($kernel->getCacheDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getCacheDir()).'</>)'],
78+
['Log directory', self::formatPath($kernel->getLogDir(), $kernel->getProjectDir()).' (<comment>'.self::formatFileSize($kernel->getLogDir()).'</>)'],
7979
new TableSeparator(),
80-
array('<info>PHP</>'),
80+
['<info>PHP</>'],
8181
new TableSeparator(),
82-
array('Version', PHP_VERSION),
83-
array('Architecture', (PHP_INT_SIZE * 8).' bits'),
84-
array('Intl locale', class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'),
85-
array('Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'),
86-
array('OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'),
87-
array('APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'),
88-
array('Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'),
89-
);
82+
['Version', PHP_VERSION],
83+
['Architecture', (PHP_INT_SIZE * 8).' bits'],
84+
['Intl locale', class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
85+
['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'],
86+
['OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
87+
['APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
88+
['Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'],
89+
];
9090

9191
if ($dotenv = self::getDotenvVars()) {
92-
$rows = array_merge($rows, array(
92+
$rows = array_merge($rows, [
9393
new TableSeparator(),
94-
array('<info>Environment (.env)</>'),
94+
['<info>Environment (.env)</>'],
9595
new TableSeparator(),
96-
), array_map(function ($value, $name) {
97-
return array($name, $value);
96+
], array_map(function ($value, $name) {
97+
return [$name, $value];
9898
}, $dotenv, array_keys($dotenv)));
9999
}
100100

101-
$io->table(array(), $rows);
101+
$io->table([], $rows);
102102
}
103103

104104
private static function formatPath(string $path, string $baseDir): string
@@ -129,7 +129,7 @@ private static function isExpired(string $date): bool
129129

130130
private static function getDotenvVars(): array
131131
{
132-
$vars = array();
132+
$vars = [];
133133
foreach (explode(',', getenv('SYMFONY_DOTENV_VARS')) as $name) {
134134
if ('' !== $name && false !== $value = getenv($name)) {
135135
$vars[$name] = $value;

‎Command/AbstractConfigCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
2929
protected function listBundles($output)
3030
{
3131
$title = 'Available registered bundles with their extension alias if available';
32-
$headers = array('Bundle name', 'Extension alias');
33-
$rows = array();
32+
$headers = ['Bundle name', 'Extension alias'];
33+
$rows = [];
3434

3535
$bundles = $this->getApplication()->getKernel()->getBundles();
3636
usort($bundles, function ($bundleA, $bundleB) {
@@ -39,7 +39,7 @@ protected function listBundles($output)
3939

4040
foreach ($bundles as $bundle) {
4141
$extension = $bundle->getContainerExtension();
42-
$rows[] = array($bundle->getName(), $extension ? $extension->getAlias() : '');
42+
$rows[] = [$bundle->getName(), $extension ? $extension->getAlias() : ''];
4343
}
4444

4545
if ($output instanceof StyleInterface) {

0 commit comments

Comments
 (0)