Update: php-cs-fixer, enable short array syntax

FriendsOfSymfony1 · Mar 13, 2024 · 1ac0672 · 1ac0672
1 parent 5736b60
commit 1ac0672
Show file tree

Hide file tree

Showing 575 changed files with 5,188 additions and 5,188 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -19,7 +19,7 @@
     '@PhpCsFixer' => true,
     '@Symfony' => true,
     'array_syntax' => array(
-        'syntax' => 'long',
+        'syntax' => 'short',
     ),
 ))
     ->setCacheFile('.php-cs-fixer.cache')

diff --git a/data/bin/changelog.php b/data/bin/changelog.php
@@ -36,10 +36,10 @@
 list($out, $err) = $filesystem->execute('svn info --xml');
 $info = new SimpleXMLElement($out);
 
-list($out, $err) = $filesystem->execute(vsprintf('svn log %s --xml %s', array_map('escapeshellarg', array(
+list($out, $err) = $filesystem->execute(vsprintf('svn log %s --xml %s', array_map('escapeshellarg', [
     $argv[1],
     (string) $info->entry->repository->root.$argv[2],
-))));
+])));
 $log = new SimpleXMLElement($out);
 
 foreach ($log->logentry as $logentry) {

diff --git a/data/bin/release.php b/data/bin/release.php
@@ -73,7 +73,7 @@
 // add class files
 $finder = sfFinder::type('file')->relative();
 $xml_classes = '';
-$dirs = array('lib' => 'php', 'data' => 'data');
+$dirs = ['lib' => 'php', 'data' => 'data'];
 foreach ($dirs as $dir => $role) {
     $class_files = $finder->in($dir);
     foreach ($class_files as $file) {
@@ -82,12 +82,12 @@
 }
 
 // replace tokens
-$filesystem->replaceTokens(getcwd().DIRECTORY_SEPARATOR.'package.xml', '##', '##', array(
+$filesystem->replaceTokens(getcwd().DIRECTORY_SEPARATOR.'package.xml', '##', '##', [
     'SYMFONY_VERSION' => $version,
     'CURRENT_DATE' => date('Y-m-d'),
     'CLASS_FILES' => $xml_classes,
     'STABILITY' => $stability,
-));
+]);
 
 list($results) = $filesystem->execute('pear package');
 echo $results;

diff --git a/data/bin/sandbox_installer.php b/data/bin/sandbox_installer.php
@@ -23,7 +23,7 @@
 chmod(sfConfig::get('sf_data_dir').'/sandbox.db', 0777);
 
 $this->logSection('install', 'add an empty file in empty directories');
-$seen = array();
+$seen = [];
 foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(sfConfig::get('sf_root_dir')), RecursiveIteratorIterator::CHILD_FIRST) as $path => $item) {
     if (!isset($seen[$path]) && $item->isDir() && !$item->isLink()) {
         touch($item->getRealPath().'/.sf');

diff --git a/lib/action/sfAction.class.php b/lib/action/sfAction.class.php
@@ -20,7 +20,7 @@
  */
 abstract class sfAction extends sfComponent
 {
-    protected $security = array();
+    protected $security = [];
 
     /**
      * Initializes this action.
@@ -122,7 +122,7 @@ public function redirect404()
     public function forward($module, $action)
     {
         if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Forward to action "%s/%s"', $module, $action))));
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', [sprintf('Forward to action "%s/%s"', $module, $action)]));
         }
 
         $this->getController()->forward($module, $action);
@@ -184,7 +184,7 @@ public function redirect($url, $statusCode = 302)
     {
         // compatibility with url_for2() style signature
         if (is_object($statusCode) || is_array($statusCode)) {
-            $url = array_merge(array('sf_route' => $url), is_object($statusCode) ? array('sf_subject' => $statusCode) : $statusCode);
+            $url = array_merge(['sf_route' => $url], is_object($statusCode) ? ['sf_subject' => $statusCode] : $statusCode);
             $statusCode = func_num_args() >= 3 ? func_get_arg(2) : 302;
         }
 
@@ -211,7 +211,7 @@ public function redirectIf($condition, $url, $statusCode = 302)
         if ($condition) {
             // compatibility with url_for2() style signature
             $arguments = func_get_args();
-            call_user_func_array(array($this, 'redirect'), array_slice($arguments, 1));
+            call_user_func_array([$this, 'redirect'], array_slice($arguments, 1));
         }
     }
 
@@ -233,7 +233,7 @@ public function redirectUnless($condition, $url, $statusCode = 302)
         if (!$condition) {
             // compatibility with url_for2() style signature
             $arguments = func_get_args();
-            call_user_func_array(array($this, 'redirect'), array_slice($arguments, 1));
+            call_user_func_array([$this, 'redirect'], array_slice($arguments, 1));
         }
     }
 
@@ -430,7 +430,7 @@ public function getCredential()
     public function setTemplate($name, $module = null)
     {
         if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Change template to "%s/%s"', null === $module ? 'CURRENT' : $module, $name))));
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', [sprintf('Change template to "%s/%s"', null === $module ? 'CURRENT' : $module, $name)]));
         }
 
         if (null !== $module) {
@@ -468,7 +468,7 @@ public function getTemplate()
     public function setLayout($name)
     {
         if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Change layout to "%s"', $name))));
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', [sprintf('Change layout to "%s"', $name)]));
         }
 
         sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout', $name);

diff --git a/lib/action/sfActionStack.class.php b/lib/action/sfActionStack.class.php
@@ -19,7 +19,7 @@
 class sfActionStack
 {
     /** @var sfActionStackEntry[] */
-    protected $stack = array();
+    protected $stack = [];
 
     /**
      * Adds an entry to the action stack.

diff --git a/lib/action/sfActions.class.php b/lib/action/sfActions.class.php
@@ -41,13 +41,13 @@ public function execute($request)
             throw new sfInitializationException(sprintf('sfAction initialization failed for module "%s". There was no action given.', $this->getModuleName()));
         }
 
-        if (!is_callable(array($this, $actionToRun))) {
+        if (!is_callable([$this, $actionToRun])) {
             // action not found
             throw new sfInitializationException(sprintf('sfAction initialization failed for module "%s", action "%s". You must create a "%s" method.', $this->getModuleName(), $this->getActionName(), $actionToRun));
         }
 
         if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Call "%s->%s()"', get_class($this), $actionToRun))));
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', [sprintf('Call "%s->%s()"', get_class($this), $actionToRun)]));
         }
 
         // run action

diff --git a/lib/action/sfComponent.class.php b/lib/action/sfComponent.class.php
@@ -62,7 +62,7 @@ public function __construct($context, $moduleName, $actionName)
      *
      * @return string The translated string
      */
-    public function __($string, $args = array(), $catalogue = 'messages')
+    public function __($string, $args = [], $catalogue = 'messages')
     {
         return $this->context->getI18N()->__($string, $args, $catalogue);
     }
@@ -128,7 +128,7 @@ public function __unset($name)
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'component.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'component.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
             throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
@@ -247,7 +247,7 @@ final public function getLogger()
     public function logMessage($message, $priority = 'info')
     {
         if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array($message, 'priority' => constant('sfLogger::'.strtoupper($priority)))));
+            $this->dispatcher->notify(new sfEvent($this, 'application.log', [$message, 'priority' => constant('sfLogger::'.strtoupper($priority))]));
         }
     }
 
@@ -339,7 +339,7 @@ public function getController()
      *
      * @return string The URL
      */
-    public function generateUrl($route, $params = array(), $absolute = false)
+    public function generateUrl($route, $params = [], $absolute = false)
     {
         return $this->context->getRouting()->generate($route, $params, $absolute);
     }

diff --git a/lib/addon/sfData.class.php b/lib/addon/sfData.class.php
@@ -17,7 +17,7 @@
 abstract class sfData
 {
     protected $deleteCurrentData = true;
-    protected $object_references = array();
+    protected $object_references = [];
 
     /**
      * Sets a flag to indicate if the current data in the database
@@ -66,7 +66,7 @@ public function getFiles($element = null)
             $element = sfConfig::get('sf_data_dir').'/fixtures';
         }
 
-        $files = array();
+        $files = [];
         if (is_array($element)) {
             foreach ($element as $e) {
                 $files = array_merge($files, $this->getFiles($e));
@@ -106,8 +106,8 @@ protected function doLoadDataFromFile($file)
      */
     protected function doLoadData(array $files)
     {
-        $this->object_references = array();
-        $this->maps = array();
+        $this->object_references = [];
+        $this->maps = [];
 
         foreach ($files as $file) {
             $this->doLoadDataFromFile($file);

diff --git a/lib/addon/sfPager.class.php b/lib/addon/sfPager.class.php
@@ -23,7 +23,7 @@ abstract class sfPager implements Iterator, Countable
     protected $tableName = '';
     protected $objects;
     protected $cursor = 1;
-    protected $parameters = array();
+    protected $parameters = [];
     protected $currentMaxLink = 1;
     protected $parameterHolder;
     protected $maxRecordLimit = false;
@@ -97,7 +97,7 @@ public function setMaxRecordLimit($limit)
      */
     public function getLinks($nb_links = 5)
     {
-        $links = array();
+        $links = [];
         $tmp = $this->page - floor($nb_links / 2);
         $check = $this->lastPage - $nb_links + 1;
         $limit = $check > 0 ? $check : 1;

diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php
@@ -21,8 +21,8 @@ class sfAutoload
     protected static $freshCache = false;
     protected static $instance;
 
-    protected $overriden = array();
-    protected $classes = array();
+    protected $overriden = [];
+    protected $classes = [];
 
     protected function __construct()
     {
@@ -51,7 +51,7 @@ public static function register()
     {
         ini_set('unserialize_callback_func', 'spl_autoload_call');
 
-        if (false === spl_autoload_register(array(self::getInstance(), 'autoload'))) {
+        if (false === spl_autoload_register([self::getInstance(), 'autoload'])) {
             throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
         }
     }
@@ -61,7 +61,7 @@ public static function register()
      */
     public static function unregister()
     {
-        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
+        spl_autoload_unregister([self::getInstance(), 'autoload']);
     }
 
     /**

diff --git a/lib/autoload/sfAutoloadAgain.class.php b/lib/autoload/sfAutoloadAgain.class.php
@@ -65,7 +65,7 @@ public function autoload($class)
                 }
             }
         } else {
-            $position = array_search(array(__CLASS__, 'autoload'), $autoloads, true);
+            $position = array_search([__CLASS__, 'autoload'], $autoloads, true);
         }
 
         if (isset($autoloads[$position + 1])) {
@@ -102,7 +102,7 @@ public function isRegistered()
     public function register()
     {
         if (!$this->isRegistered()) {
-            spl_autoload_register(array($this, 'autoload'));
+            spl_autoload_register([$this, 'autoload']);
             $this->registered = true;
         }
     }
@@ -112,7 +112,7 @@ public function register()
      */
     public function unregister()
     {
-        spl_autoload_unregister(array($this, 'autoload'));
+        spl_autoload_unregister([$this, 'autoload']);
         $this->registered = false;
     }
 }
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
@@ -28,7 +28,7 @@ class sfCoreAutoload
 
     // Don't edit this property by hand.
     // To update it, use sfCoreAutoload::make()
-    protected $classes = array(
+    protected $classes = [
         'sfaction' => 'action/sfAction.class.php',
         'sfactionstack' => 'action/sfActionStack.class.php',
         'sfactionstackentry' => 'action/sfActionStackEntry.class.php',
@@ -392,7 +392,7 @@ class sfCoreAutoload
         'sfyamldumper' => 'yaml/sfYamlDumper.class.php',
         'sfyamlinline' => 'yaml/sfYamlInline.class.php',
         'sfyamlparser' => 'yaml/sfYamlParser.class.php',
-    );
+    ];
 
     protected function __construct()
     {
@@ -425,7 +425,7 @@ public static function register()
         }
 
         ini_set('unserialize_callback_func', 'spl_autoload_call');
-        if (false === spl_autoload_register(array(self::getInstance(), 'autoload'))) {
+        if (false === spl_autoload_register([self::getInstance(), 'autoload'])) {
             throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
         }
 
@@ -437,7 +437,7 @@ public static function register()
      */
     public static function unregister()
     {
-        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
+        spl_autoload_unregister([self::getInstance(), 'autoload']);
         self::$registered = false;
     }
 

diff --git a/lib/autoload/sfSimpleAutoload.class.php b/lib/autoload/sfSimpleAutoload.class.php
@@ -24,10 +24,10 @@ class sfSimpleAutoload
     protected $cacheFile;
     protected $cacheLoaded = false;
     protected $cacheChanged = false;
-    protected $dirs = array();
-    protected $files = array();
-    protected $classes = array();
-    protected $overriden = array();
+    protected $dirs = [];
+    protected $files = [];
+    protected $classes = [];
+    protected $overriden = [];
 
     protected function __construct($cacheFile = null)
     {
@@ -66,12 +66,12 @@ public static function register()
         }
 
         ini_set('unserialize_callback_func', 'spl_autoload_call');
-        if (false === spl_autoload_register(array(self::getInstance(), 'autoload'))) {
+        if (false === spl_autoload_register([self::getInstance(), 'autoload'])) {
             throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
         }
 
         if (self::getInstance()->cacheFile) {
-            register_shutdown_function(array(self::getInstance(), 'saveCache'));
+            register_shutdown_function([self::getInstance(), 'saveCache']);
         }
 
         self::$registered = true;
@@ -82,7 +82,7 @@ public static function register()
      */
     public static function unregister()
     {
-        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
+        spl_autoload_unregister([self::getInstance(), 'autoload']);
         self::$registered = false;
     }
 
@@ -140,7 +140,7 @@ public function saveCache()
     {
         if ($this->cacheChanged) {
             if (is_writable(dirname($this->cacheFile))) {
-                file_put_contents($this->cacheFile, serialize(array($this->classes, $this->dirs, $this->files)));
+                file_put_contents($this->cacheFile, serialize([$this->classes, $this->dirs, $this->files]));
             }
 
             $this->cacheChanged = false;
@@ -152,7 +152,7 @@ public function saveCache()
      */
     public function reload()
     {
-        $this->classes = array();
+        $this->classes = [];
         $this->cacheLoaded = false;
 
         foreach ($this->dirs as $dir) {

diff --git a/lib/cache/sfAPCCache.class.php b/lib/cache/sfAPCCache.class.php
@@ -26,7 +26,7 @@ class sfAPCCache extends sfCache
      *
      * @see sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 

diff --git a/lib/cache/sfAPCuCache.class.php b/lib/cache/sfAPCuCache.class.php
@@ -27,7 +27,7 @@ class sfAPCuCache extends sfCache
      *
      * @see sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);