diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index f5e11f987..f4f6af907 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,11 +1,23 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
     ->ignoreVCSIgnored(true)
     ->in(__DIR__.'/lib')
     ->in(__DIR__.'/data/bin')
     ->in(__DIR__.'/test')
-    ->append(array(__FILE__))
+    ->append([__FILE__])
     // Exclude PHP classes templates/generators, which are not valid PHP files
     ->exclude('task/generator/skeleton/')
     ->exclude('plugins/sfDoctrinePlugin/data/generator/')
@@ -14,14 +26,31 @@
     ->notPath('unit/config/fixtures/sfFilterConfigHandler/result.php')
 ;
 
-$config = new PhpCsFixer\Config();
-$config->setRules(array(
+$config = new Config();
+$config->setRules([
     '@PhpCsFixer' => true,
     '@Symfony' => true,
-    'array_syntax' => array(
-        'syntax' => 'long',
-    ),
-))
+    '@PSR12' => true,
+    'array_syntax' => [
+        'syntax' => 'short',
+    ],
+    'fully_qualified_strict_types' => [
+        'import_symbols' => true,
+        'leading_backslash_in_global_namespace' => true,
+    ],
+    'header_comment' => [
+        'header' => <<<'EOF'
+This file is part of the Symfony1 package.
+
+(c) Fabien Potencier <fabien@symfony.com>
+
+For the full copyright and license information, please view the LICENSE
+file that was distributed with this source code.
+EOF
+    ],
+    'modernize_strpos' => true,
+])
+    ->setRiskyAllowed(true)
     ->setCacheFile('.php-cs-fixer.cache')
     ->setFinder($finder)
 ;
diff --git a/data/bin/changelog.php b/data/bin/changelog.php
index 4eaf5868a..9e232b988 100644
--- a/data/bin/changelog.php
+++ b/data/bin/changelog.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -31,16 +32,16 @@
     exit(1);
 }
 
-$filesystem = new sfFilesystem();
+$filesystem = new \sfFilesystem();
 
 list($out, $err) = $filesystem->execute('svn info --xml');
-$info = new SimpleXMLElement($out);
+$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);
+])));
+$log = new \SimpleXMLElement($out);
 
 foreach ($log->logentry as $logentry) {
     echo sprintf(' * [%d] %s', $logentry['revision'], trim(preg_replace('/\s*\[[\d\., ]+\]\s*/', '', (string) $logentry->msg)));
diff --git a/data/bin/check_configuration.php b/data/bin/check_configuration.php
index ccccb38ec..797700ae1 100644
--- a/data/bin/check_configuration.php
+++ b/data/bin/check_configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 function is_cli()
 {
     return !isset($_SERVER['HTTP_HOST']);
@@ -67,7 +76,7 @@ function get_ini_path()
 echo "\n** Optional checks **\n\n";
 check(class_exists('PDO'), 'PDO is installed', 'Install PDO (mandatory for Doctrine)', false);
 if (class_exists('PDO')) {
-    $drivers = PDO::getAvailableDrivers();
+    $drivers = \PDO::getAvailableDrivers();
     check(count($drivers), 'PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)');
 }
 check(function_exists('token_get_all'), 'The token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false);
diff --git a/data/bin/release.php b/data/bin/release.php
index df6dec94f..1c8cb7e87 100644
--- a/data/bin/release.php
+++ b/data/bin/release.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2007 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,16 +27,16 @@
 require_once __DIR__.'/../../lib/vendor/lime/lime.php';
 
 if (!isset($argv[1])) {
-    throw new Exception('You must provide version prefix.');
+    throw new \Exception('You must provide version prefix.');
 }
 
 if (!isset($argv[2])) {
-    throw new Exception('You must provide stability status (alpha/beta/stable).');
+    throw new \Exception('You must provide stability status (alpha/beta/stable).');
 }
 
 $stability = $argv[2];
 
-$filesystem = new sfFilesystem();
+$filesystem = new \sfFilesystem();
 
 if (('beta' == $stability || 'alpha' == $stability) && count(explode('.', $argv[1])) < 2) {
     $version_prefix = $argv[1];
@@ -46,7 +47,7 @@
     }
 
     if (!isset($version)) {
-        throw new Exception('Unable to find last SVN revision.');
+        throw new \Exception('Unable to find last SVN revision.');
     }
 
     // make a PEAR compatible version
@@ -61,7 +62,7 @@
 list($result) = $filesystem->execute('php data/bin/symfony symfony:test');
 
 if (0 != $result) {
-    throw new Exception('Some tests failed. Release process aborted!');
+    throw new \Exception('Some tests failed. Release process aborted!');
 }
 
 if (is_file('package.xml')) {
@@ -71,9 +72,9 @@
 $filesystem->copy(getcwd().'/package.xml.tmpl', getcwd().'/package.xml');
 
 // add class files
-$finder = sfFinder::type('file')->relative();
+$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 +83,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
index 576b28c01..3fb0ac269 100644
--- a/data/bin/sandbox_installer.php
+++ b/data/bin/sandbox_installer.php
@@ -1,15 +1,24 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $this->installDir(__DIR__.'/sandbox_skeleton');
 
 $this->logSection('install', 'add symfony CLI for Windows users');
-$this->getFilesystem()->copy(__DIR__.'/symfony.bat', sfConfig::get('sf_root_dir').'/symfony.bat');
+$this->getFilesystem()->copy(__DIR__.'/symfony.bat', \sfConfig::get('sf_root_dir').'/symfony.bat');
 
 $this->logSection('install', 'add LICENSE');
-$this->getFilesystem()->copy(__DIR__.'/../../LICENSE', sfConfig::get('sf_root_dir').'/LICENSE');
+$this->getFilesystem()->copy(__DIR__.'/../../LICENSE', \sfConfig::get('sf_root_dir').'/LICENSE');
 
 $this->logSection('install', 'default to sqlite');
-$this->runTask('configure:database', sprintf("'sqlite:%s/sandbox.db'", sfConfig::get('sf_data_dir')));
+$this->runTask('configure:database', sprintf("'sqlite:%s/sandbox.db'", \sfConfig::get('sf_data_dir')));
 
 $this->logSection('install', 'create an application');
 $this->runTask('generate:app', 'frontend');
@@ -18,13 +27,13 @@
 $this->runTask('plugin:publish-assets');
 
 $this->logSection('install', 'fix sqlite database permissions');
-touch(sfConfig::get('sf_data_dir').'/sandbox.db');
-chmod(sfConfig::get('sf_data_dir'), 0777);
-chmod(sfConfig::get('sf_data_dir').'/sandbox.db', 0777);
+touch(\sfConfig::get('sf_data_dir').'/sandbox.db');
+chmod(\sfConfig::get('sf_data_dir'), 0777);
+chmod(\sfConfig::get('sf_data_dir').'/sandbox.db', 0777);
 
 $this->logSection('install', 'add an empty file in empty directories');
-$seen = array();
-foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(sfConfig::get('sf_root_dir')), RecursiveIteratorIterator::CHILD_FIRST) as $path => $item) {
+$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
index cc007b101..488d38a11 100644
--- a/lib/action/sfAction.class.php
+++ b/lib/action/sfAction.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,16 +20,16 @@
  * @method sfWebController getController()
  * @method sfWebResponse   getResponse()
  */
-abstract class sfAction extends sfComponent
+abstract class sfAction extends \sfComponent
 {
-    protected $security = array();
+    protected $security = [];
 
     /**
      * Initializes this action.
      *
-     * @param sfContext $context    the current application context
-     * @param string    $moduleName the module name
-     * @param string    $actionName the action name
+     * @param \sfContext $context    the current application context
+     * @param string     $moduleName the module name
+     * @param string     $actionName the action name
      */
     public function initialize($context, $moduleName, $actionName)
     {
@@ -64,11 +64,11 @@ public function postExecute()
      *
      * @param string $message Message of the generated exception
      *
-     * @throws sfError404Exception
+     * @throws \sfError404Exception
      */
     public function forward404($message = null)
     {
-        throw new sfError404Exception($this->get404Message($message));
+        throw new \sfError404Exception($this->get404Message($message));
     }
 
     /**
@@ -77,12 +77,12 @@ public function forward404($message = null)
      * @param bool   $condition A condition that evaluates to true or false
      * @param string $message   Message of the generated exception
      *
-     * @throws sfError404Exception
+     * @throws \sfError404Exception
      */
     public function forward404Unless($condition, $message = null)
     {
         if (!$condition) {
-            throw new sfError404Exception($this->get404Message($message));
+            throw new \sfError404Exception($this->get404Message($message));
         }
     }
 
@@ -92,12 +92,12 @@ public function forward404Unless($condition, $message = null)
      * @param bool   $condition A condition that evaluates to true or false
      * @param string $message   Message of the generated exception
      *
-     * @throws sfError404Exception
+     * @throws \sfError404Exception
      */
     public function forward404If($condition, $message = null)
     {
         if ($condition) {
-            throw new sfError404Exception($this->get404Message($message));
+            throw new \sfError404Exception($this->get404Message($message));
         }
     }
 
@@ -108,7 +108,7 @@ public function forward404If($condition, $message = null)
      */
     public function redirect404()
     {
-        return $this->redirect('/'.sfConfig::get('sf_error_404_module').'/'.sfConfig::get('sf_error_404_action'));
+        return $this->redirect('/'.\sfConfig::get('sf_error_404_module').'/'.\sfConfig::get('sf_error_404_action'));
     }
 
     /**
@@ -119,17 +119,17 @@ public function redirect404()
      * @param string $module A module name
      * @param string $action An action name
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      */
     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))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Forward to action "%s/%s"', $module, $action)]));
         }
 
         $this->getController()->forward($module, $action);
 
-        throw new sfStopException();
+        throw new \sfStopException();
     }
 
     /**
@@ -141,7 +141,7 @@ public function forward($module, $action)
      * @param string $module    A module name
      * @param string $action    An action name
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      */
     public function forwardIf($condition, $module, $action)
     {
@@ -159,7 +159,7 @@ public function forwardIf($condition, $module, $action)
      * @param string $module    A module name
      * @param string $action    An action name
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      */
     public function forwardUnless($condition, $module, $action)
     {
@@ -180,19 +180,19 @@ public function forwardUnless($condition, $module, $action)
      * @param string $url        Url
      * @param int    $statusCode Status code (default to 302)
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      */
     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;
         }
 
         $this->getController()->redirect($url, 0, $statusCode);
 
-        throw new sfStopException();
+        throw new \sfStopException();
     }
 
     /**
@@ -204,16 +204,16 @@ public function redirect($url, $statusCode = 302)
      * @param string $url        Url
      * @param int    $statusCode Status code (default to 302)
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      *
-     * @see redirect
+     * @see \redirect
      */
     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));
         }
     }
 
@@ -226,16 +226,16 @@ public function redirectIf($condition, $url, $statusCode = 302)
      * @param string $url        Url
      * @param int    $statusCode Status code (default to 302)
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      *
-     * @see redirect
+     * @see \redirect
      */
     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));
         }
     }
 
@@ -254,7 +254,7 @@ public function renderText($text)
     {
         $this->getResponse()->setContent($this->getResponse()->getContent().$text);
 
-        return sfView::NONE;
+        return \sfView::NONE;
     }
 
     /**
@@ -271,7 +271,7 @@ public function renderJson($data)
         $this->getResponse()->setContentType('application/json');
         $this->getResponse()->setContent(json_encode($data));
 
-        return sfView::NONE;
+        return \sfView::NONE;
     }
 
     /**
@@ -309,7 +309,7 @@ public function getPartial($templateName, $vars = null)
      *
      * @return string sfView::NONE
      *
-     * @see    getPartial
+     * @see    \getPartial
      */
     public function renderPartial($templateName, $vars = null)
     {
@@ -353,7 +353,7 @@ public function getComponent($moduleName, $componentName, $vars = null)
      *
      * @return string sfView::NONE
      *
-     * @see    getComponent
+     * @see    \getComponent
      */
     public function renderComponent($moduleName, $componentName, $vars = null)
     {
@@ -431,16 +431,16 @@ 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))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Change template to "%s/%s"', null === $module ? 'CURRENT' : $module, $name)]));
         }
 
         if (null !== $module) {
-            $dir = $this->context->getConfiguration()->getTemplateDir($module, $name.sfView::SUCCESS.'.php');
+            $dir = $this->context->getConfiguration()->getTemplateDir($module, $name.\sfView::SUCCESS.'.php');
             $name = $dir.'/'.$name;
         }
 
-        sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template', $name);
+        \sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template', $name);
     }
 
     /**
@@ -455,7 +455,7 @@ public function setTemplate($name, $module = null)
      */
     public function getTemplate()
     {
-        return sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template');
+        return \sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template');
     }
 
     /**
@@ -469,11 +469,11 @@ 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))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Change layout to "%s"', $name)]));
         }
 
-        sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout', $name);
+        \sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout', $name);
     }
 
     /**
@@ -486,7 +486,7 @@ public function setLayout($name)
      */
     public function getLayout()
     {
-        return sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout');
+        return \sfConfig::get('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_layout');
     }
 
     /**
@@ -496,13 +496,13 @@ public function getLayout()
      */
     public function setViewClass($class)
     {
-        sfConfig::set('mod_'.strtolower($this->getModuleName()).'_view_class', $class);
+        \sfConfig::set('mod_'.strtolower($this->getModuleName()).'_view_class', $class);
     }
 
     /**
      * Returns the current route for this request.
      *
-     * @return sfRoute The route for the request
+     * @return \sfRoute The route for the request
      */
     public function getRoute()
     {
diff --git a/lib/action/sfActionStack.class.php b/lib/action/sfActionStack.class.php
index 41c17e228..3569d6a62 100644
--- a/lib/action/sfActionStack.class.php
+++ b/lib/action/sfActionStack.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,21 +21,21 @@
 class sfActionStack
 {
     /** @var sfActionStackEntry[] */
-    protected $stack = array();
+    protected $stack = [];
 
     /**
      * Adds an entry to the action stack.
      *
-     * @param string   $moduleName     A module name
-     * @param string   $actionName     An action name
-     * @param sfAction $actionInstance An sfAction implementation instance
+     * @param string    $moduleName     A module name
+     * @param string    $actionName     An action name
+     * @param \sfAction $actionInstance An sfAction implementation instance
      *
-     * @return sfActionStackEntry sfActionStackEntry instance
+     * @return \sfActionStackEntry sfActionStackEntry instance
      */
     public function addEntry($moduleName, $actionName, $actionInstance)
     {
         // create our action stack entry and add it to our stack
-        $actionEntry = new sfActionStackEntry($moduleName, $actionName, $actionInstance);
+        $actionEntry = new \sfActionStackEntry($moduleName, $actionName, $actionInstance);
 
         $this->stack[] = $actionEntry;
 
@@ -47,7 +47,7 @@ public function addEntry($moduleName, $actionName, $actionInstance)
      *
      * @param int $index An entry index
      *
-     * @return sfActionStackEntry an action stack entry implementation
+     * @return \sfActionStackEntry an action stack entry implementation
      */
     public function getEntry($index)
     {
@@ -63,7 +63,7 @@ public function getEntry($index)
     /**
      * Removes the entry at a specific index.
      *
-     * @return sfActionStackEntry an action stack entry implementation
+     * @return \sfActionStackEntry an action stack entry implementation
      */
     public function popEntry()
     {
diff --git a/lib/action/sfActionStackEntry.class.php b/lib/action/sfActionStackEntry.class.php
index 1624e710b..119b19028 100644
--- a/lib/action/sfActionStackEntry.class.php
+++ b/lib/action/sfActionStackEntry.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -27,9 +27,9 @@ class sfActionStackEntry
     /**
      * Class constructor.
      *
-     * @param string   $moduleName     A module name
-     * @param string   $actionName     An action name
-     * @param sfAction $actionInstance An sfAction implementation instance
+     * @param string    $moduleName     A module name
+     * @param string    $actionName     An action name
+     * @param \sfAction $actionInstance An sfAction implementation instance
      */
     public function __construct($moduleName, $actionName, $actionInstance)
     {
@@ -51,7 +51,7 @@ public function getActionName()
     /**
      * Retrieves this entry's action instance.
      *
-     * @return sfAction An sfAction implementation instance
+     * @return \sfAction An sfAction implementation instance
      */
     public function getActionInstance()
     {
diff --git a/lib/action/sfActions.class.php b/lib/action/sfActions.class.php
index 2a2de62da..55cb7e622 100644
--- a/lib/action/sfActions.class.php
+++ b/lib/action/sfActions.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfActions extends sfAction
+abstract class sfActions extends \sfAction
 {
     /**
      * Dispatches to the action defined by the 'action' parameter of the sfRequest object.
@@ -25,13 +25,13 @@ abstract class sfActions extends sfAction
      * This method try to execute the executeXXX() method of the current object where XXX is the
      * defined action name.
      *
-     * @param sfRequest $request The current sfRequest object
+     * @param \sfRequest $request The current sfRequest object
      *
      * @return string A string containing the view name associated with this action
      *
-     * @throws sfInitializationException
+     * @throws \sfInitializationException
      *
-     * @see sfAction
+     * @see \sfAction
      */
     public function execute($request)
     {
@@ -40,16 +40,16 @@ public function execute($request)
 
         if ('execute' === $actionToRun) {
             // no action given
-            throw new sfInitializationException(sprintf('sfAction initialization failed for module "%s". There was no action given.', $this->getModuleName()));
+            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));
+            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))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $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
index b933f9a83..d70f71f24 100644
--- a/lib/action/sfComponent.class.php
+++ b/lib/action/sfComponent.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,22 +24,22 @@ abstract class sfComponent
     /** @var string */
     protected $actionName = '';
 
-    /** @var sfContext */
+    /** @var \sfContext */
     protected $context;
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
-    /** @var sfRequest */
+    /** @var \sfRequest */
     protected $request;
 
-    /** @var sfResponse */
+    /** @var \sfResponse */
     protected $response;
 
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $varHolder;
 
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $requestParameterHolder;
 
     /**
@@ -46,9 +47,9 @@ abstract class sfComponent
      *
      * @see initialize()
      *
-     * @param sfContext $context
-     * @param string    $moduleName
-     * @param string    $actionName
+     * @param \sfContext $context
+     * @param string     $moduleName
+     * @param string     $actionName
      */
     public function __construct($context, $moduleName, $actionName)
     {
@@ -64,7 +65,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);
     }
@@ -126,13 +127,13 @@ public function __unset($name)
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException If called method is undefined
+     * @throws \sfException If called method is undefined
      */
     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));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -141,9 +142,9 @@ public function __call($method, $arguments)
     /**
      * Initializes this component.
      *
-     * @param sfContext $context    the current application context
-     * @param string    $moduleName the module name
-     * @param string    $actionName the action name
+     * @param \sfContext $context    the current application context
+     * @param string     $moduleName the module name
+     * @param string     $actionName the action name
      */
     public function initialize($context, $moduleName, $actionName)
     {
@@ -151,7 +152,7 @@ public function initialize($context, $moduleName, $actionName)
         $this->actionName = $actionName;
         $this->context = $context;
         $this->dispatcher = $context->getEventDispatcher();
-        $this->varHolder = new sfParameterHolder();
+        $this->varHolder = new \sfParameterHolder();
         $this->request = $context->getRequest();
         $this->response = $context->getResponse();
         $this->requestParameterHolder = $this->request->getParameterHolder();
@@ -168,7 +169,7 @@ public function initialize($context, $moduleName, $actionName)
      * user account, a shopping cart, or even a something as simple as a
      * single product.
      *
-     * @param sfRequest $request The current sfRequest object
+     * @param \sfRequest $request The current sfRequest object
      *
      * @return mixed A string containing the view name associated with this action
      */
@@ -197,7 +198,7 @@ public function getActionName()
     /**
      * Retrieves the current application context.
      *
-     * @return sfContext The current sfContext instance
+     * @return \sfContext The current sfContext instance
      */
     final public function getContext()
     {
@@ -207,7 +208,7 @@ final public function getContext()
     /**
      * Retrieves the current service container instance.
      *
-     * @return sfServiceContainer The current sfServiceContainer instance
+     * @return \sfServiceContainer The current sfServiceContainer instance
      */
     final public function getServiceContainer()
     {
@@ -229,7 +230,7 @@ public function getService($id)
     /**
      * Retrieves the current logger instance.
      *
-     * @return sfLogger The current sfLogger instance
+     * @return \sfLogger The current sfLogger instance
      */
     final public function getLogger()
     {
@@ -244,12 +245,12 @@ final public function getLogger()
      *                         (available priorities: emerg, alert, crit, err,
      *                         warning, notice, info, debug)
      *
-     * @see sfLogger
+     * @see \sfLogger
      */
     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)))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [$message, 'priority' => constant('sfLogger::'.strtoupper($priority))]));
         }
     }
 
@@ -293,7 +294,7 @@ public function hasRequestParameter($name)
      *
      * <code>$this->getContext()->getRequest()</code>
      *
-     * @return sfRequest The current sfRequest implementation instance
+     * @return \sfRequest The current sfRequest implementation instance
      */
     public function getRequest()
     {
@@ -307,7 +308,7 @@ public function getRequest()
      *
      * <code>$this->getContext()->getResponse()</code>
      *
-     * @return sfResponse The current sfResponse implementation instance
+     * @return \sfResponse The current sfResponse implementation instance
      */
     public function getResponse()
     {
@@ -321,7 +322,7 @@ public function getResponse()
      *
      * <code>$this->getContext()->getController()</code>
      *
-     * @return sfController The current sfController implementation instance
+     * @return \sfController The current sfController implementation instance
      */
     public function getController()
     {
@@ -341,7 +342,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);
     }
@@ -353,7 +354,7 @@ public function generateUrl($route, $params = array(), $absolute = false)
      *
      * <code>$this->getContext()->getUser()</code>
      *
-     * @return sfUser The current sfUser implementation instance
+     * @return \sfUser The current sfUser implementation instance
      */
     public function getUser()
     {
@@ -363,7 +364,7 @@ public function getUser()
     /**
      * Gets the current mailer instance.
      *
-     * @return sfMailer A sfMailer instance
+     * @return \sfMailer A sfMailer instance
      */
     public function getMailer()
     {
@@ -383,7 +384,7 @@ public function getMailer()
      */
     public function setVar($name, $value, $safe = false)
     {
-        $this->varHolder->set($name, $safe ? new sfOutputEscaperSafe($value) : $value);
+        $this->varHolder->set($name, $safe ? new \sfOutputEscaperSafe($value) : $value);
     }
 
     /**
@@ -401,7 +402,7 @@ public function getVar($name)
     /**
      * Gets the sfParameterHolder object that stores the template variables.
      *
-     * @return sfParameterHolder the variable holder
+     * @return \sfParameterHolder the variable holder
      */
     public function getVarHolder()
     {
diff --git a/lib/action/sfComponents.class.php b/lib/action/sfComponents.class.php
index ce96e70e5..51a260caa 100644
--- a/lib/action/sfComponents.class.php
+++ b/lib/action/sfComponents.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfComponents extends sfComponent
+abstract class sfComponents extends \sfComponent
 {
     /**
-     * @param sfRequest $request
+     * @param \sfRequest $request
      *
-     * @throws sfInitializationException
+     * @throws \sfInitializationException
      *
-     * @see sfComponent
+     * @see \sfComponent
      */
     public function execute($request)
     {
-        throw new sfInitializationException('sfComponents initialization failed.');
+        throw new \sfInitializationException('sfComponents initialization failed.');
     }
 }
diff --git a/lib/addon/sfData.class.php b/lib/addon/sfData.class.php
index b03a4a55e..16c3b5427 100644
--- a/lib/addon/sfData.class.php
+++ b/lib/addon/sfData.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +20,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
@@ -60,15 +61,15 @@ abstract public function loadDataFromArray($data);
      *
      * @return array A list of *.yml files
      *
-     * @throws sfInitializationException if the directory or file does not exist
+     * @throws \sfInitializationException if the directory or file does not exist
      */
     public function getFiles($element = null)
     {
         if (null === $element) {
-            $element = sfConfig::get('sf_data_dir').'/fixtures';
+            $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));
@@ -76,9 +77,9 @@ public function getFiles($element = null)
         } elseif (is_file($element)) {
             $files[] = $element;
         } elseif (is_dir($element)) {
-            $files = sfFinder::type('file')->name('*.yml')->sort_by_name()->in($element);
+            $files = \sfFinder::type('file')->name('*.yml')->sort_by_name()->in($element);
         } else {
-            throw new sfInitializationException(sprintf('You must give an array, a directory or a file to sfData::getFiles() (%s given).', $element));
+            throw new \sfInitializationException(sprintf('You must give an array, a directory or a file to sfData::getFiles() (%s given).', $element));
         }
 
         $files = array_unique($files);
@@ -95,7 +96,7 @@ public function getFiles($element = null)
     protected function doLoadDataFromFile($file)
     {
         // import new datas
-        $data = sfYaml::load($file, sfConfig::get('sf_charset', 'UTF-8'));
+        $data = \sfYaml::load($file, \sfConfig::get('sf_charset', 'UTF-8'));
 
         $this->loadDataFromArray($data);
     }
@@ -108,8 +109,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
index 1800e3fc3..d020e86b0 100644
--- a/lib/addon/sfPager.class.php
+++ b/lib/addon/sfPager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfPager implements Iterator, Countable
+abstract class sfPager implements \Iterator, \Countable
 {
     protected $page = 1;
     protected $maxPerPage = 0;
@@ -25,7 +26,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;
@@ -43,7 +44,7 @@ public function __construct($class, $maxPerPage = 10)
     {
         $this->setClass($class);
         $this->setMaxPerPage($maxPerPage);
-        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder = new \sfParameterHolder();
     }
 
     /**
@@ -99,7 +100,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;
@@ -174,7 +175,7 @@ public function getCurrent()
     /**
      * Returns the next object.
      *
-     * @return mixed|null
+     * @return \mixed|null
      */
     public function getNext()
     {
@@ -188,7 +189,7 @@ public function getNext()
     /**
      * Returns the previous object.
      *
-     * @return mixed|null
+     * @return \mixed|null
      */
     public function getPrevious()
     {
@@ -382,7 +383,7 @@ public function isLastPage()
     /**
      * Returns the current pager's parameter holder.
      *
-     * @return sfParameterHolder
+     * @return \sfParameterHolder
      */
     public function getParameterHolder()
     {
@@ -392,8 +393,8 @@ public function getParameterHolder()
     /**
      * Returns a parameter.
      *
-     * @param string     $name
-     * @param mixed|null $default
+     * @param string      $name
+     * @param \mixed|null $default
      */
     public function getParameter($name, $default = null)
     {
@@ -425,7 +426,7 @@ public function setParameter($name, $value)
     /**
      * Returns the current result.
      *
-     * @see Iterator
+     * @see \Iterator
      */
     #[\ReturnTypeWillChange]
     public function current()
@@ -440,7 +441,7 @@ public function current()
     /**
      * Returns the current key.
      *
-     * @see Iterator
+     * @see \Iterator
      */
     #[\ReturnTypeWillChange]
     public function key()
@@ -455,7 +456,7 @@ public function key()
     /**
      * Advances the internal pointer and returns the current result.
      *
-     * @see Iterator
+     * @see \Iterator
      */
     #[\ReturnTypeWillChange]
     public function next()
@@ -472,7 +473,7 @@ public function next()
     /**
      * Resets the internal pointer and returns the current result.
      *
-     * @see Iterator
+     * @see \Iterator
      */
     #[\ReturnTypeWillChange]
     public function rewind()
@@ -489,7 +490,7 @@ public function rewind()
     /**
      * Returns true if pointer is within bounds.
      *
-     * @see Iterator
+     * @see \Iterator
      */
     #[\ReturnTypeWillChange]
     public function valid()
@@ -504,7 +505,7 @@ public function valid()
     /**
      * Returns the total number of results.
      *
-     * @see Countable
+     * @see \Countable
      */
     #[\ReturnTypeWillChange]
     public function count()
diff --git a/lib/autoload/sfAutoload.class.php b/lib/autoload/sfAutoload.class.php
index f3e238e27..2442a88a3 100644
--- a/lib/autoload/sfAutoload.class.php
+++ b/lib/autoload/sfAutoload.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,8 +24,8 @@ class sfAutoload
     protected static $freshCache = false;
     protected static $instance;
 
-    protected $overriden = array();
-    protected $classes = array();
+    protected $overriden = [];
+    protected $classes = [];
 
     protected function __construct()
     {
@@ -33,12 +34,12 @@ protected function __construct()
     /**
      * Retrieves the singleton instance of this class.
      *
-     * @return sfAutoload a sfAutoload implementation instance
+     * @return \sfAutoload a sfAutoload implementation instance
      */
     public static function getInstance()
     {
         if (!isset(self::$instance)) {
-            self::$instance = new sfAutoload();
+            self::$instance = new \sfAutoload();
         }
 
         return self::$instance;
@@ -47,14 +48,14 @@ public static function getInstance()
     /**
      * Register sfAutoload in spl autoloader.
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public static function register()
     {
         ini_set('unserialize_callback_func', 'spl_autoload_call');
 
-        if (false === spl_autoload_register(array(self::getInstance(), 'autoload'))) {
-            throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
+        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())));
         }
     }
 
@@ -63,7 +64,7 @@ public static function register()
      */
     public static function unregister()
     {
-        spl_autoload_unregister(array(self::getInstance(), 'autoload'));
+        spl_autoload_unregister([self::getInstance(), 'autoload']);
     }
 
     /**
@@ -86,7 +87,7 @@ public function setClassPath($class, $path)
      *
      * @param string $class A PHP class name
      *
-     * @return string|null An absolute path
+     * @return \string|null An absolute path
      */
     public function getClassPath($class)
     {
@@ -109,8 +110,8 @@ public function reloadClasses($force = false)
             return false;
         }
 
-        $configuration = sfProjectConfiguration::getActive();
-        if (!$configuration || !$configuration instanceof sfApplicationConfiguration) {
+        $configuration = \sfProjectConfiguration::getActive();
+        if (!$configuration || !$configuration instanceof \sfApplicationConfiguration) {
             return false;
         }
 
@@ -177,10 +178,10 @@ public function loadClass($class)
         if (isset($this->classes[$class])) {
             try {
                 require $this->classes[$class];
-            } catch (sfException $e) {
+            } catch (\sfException $e) {
                 $e->printStackTrace();
-            } catch (Exception $e) {
-                sfException::createFromException($e)->printStackTrace();
+            } catch (\Exception $e) {
+                \sfException::createFromException($e)->printStackTrace();
             }
 
             return true;
@@ -188,16 +189,16 @@ public function loadClass($class)
 
         // see if the file exists in the current module lib directory
         if (
-            sfContext::hasInstance()
-            && ($module = sfContext::getInstance()->getModuleName())
+            \sfContext::hasInstance()
+            && ($module = \sfContext::getInstance()->getModuleName())
             && isset($this->classes[$module.'/'.$class])
         ) {
             try {
                 require $this->classes[$module.'/'.$class];
-            } catch (sfException $e) {
+            } catch (\sfException $e) {
                 $e->printStackTrace();
-            } catch (Exception $e) {
-                sfException::createFromException($e)->printStackTrace();
+            } catch (\Exception $e) {
+                \sfException::createFromException($e)->printStackTrace();
             }
 
             return true;
diff --git a/lib/autoload/sfAutoloadAgain.class.php b/lib/autoload/sfAutoloadAgain.class.php
index edf0c9461..1526a560c 100644
--- a/lib/autoload/sfAutoloadAgain.class.php
+++ b/lib/autoload/sfAutoloadAgain.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -32,7 +33,7 @@ protected function __construct()
     /**
      * Returns the singleton autoloader.
      *
-     * @return sfAutoloadAgain
+     * @return \sfAutoloadAgain
      */
     public static function getInstance()
     {
@@ -67,7 +68,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])) {
@@ -80,7 +81,7 @@ public function autoload($class)
             return class_exists($class, false) || interface_exists($class, false);
         }
 
-        $autoload = sfAutoload::getInstance();
+        $autoload = \sfAutoload::getInstance();
         $autoload->reloadClasses(true);
 
         $this->reloaded = true;
@@ -104,7 +105,7 @@ public function isRegistered()
     public function register()
     {
         if (!$this->isRegistered()) {
-            spl_autoload_register(array($this, 'autoload'));
+            spl_autoload_register([$this, 'autoload']);
             $this->registered = true;
         }
     }
@@ -114,7 +115,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
index fafe37026..3120093b2 100755
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -30,7 +31,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',
@@ -394,7 +395,7 @@ class sfCoreAutoload
         'sfyamldumper' => 'yaml/sfYamlDumper.class.php',
         'sfyamlinline' => 'yaml/sfYamlInline.class.php',
         'sfyamlparser' => 'yaml/sfYamlParser.class.php',
-    );
+    ];
 
     protected function __construct()
     {
@@ -404,12 +405,12 @@ protected function __construct()
     /**
      * Retrieves the singleton instance of this class.
      *
-     * @return sfCoreAutoload a sfCoreAutoload implementation instance
+     * @return \sfCoreAutoload a sfCoreAutoload implementation instance
      */
     public static function getInstance()
     {
         if (!isset(self::$instance)) {
-            self::$instance = new sfCoreAutoload();
+            self::$instance = new \sfCoreAutoload();
         }
 
         return self::$instance;
@@ -418,7 +419,7 @@ public static function getInstance()
     /**
      * Register sfCoreAutoload in spl autoloader.
      *
-     * @throws sfException If unable to register SPL autoload function
+     * @throws \sfException If unable to register SPL autoload function
      */
     public static function register()
     {
@@ -427,8 +428,8 @@ public static function register()
         }
 
         ini_set('unserialize_callback_func', 'spl_autoload_call');
-        if (false === spl_autoload_register(array(self::getInstance(), 'autoload'))) {
-            throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
+        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())));
         }
 
         self::$registered = true;
@@ -439,7 +440,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;
     }
 
@@ -466,7 +467,7 @@ public function autoload($class)
      *
      * @param string $class The class name (case insensitive)
      *
-     * @return string|null An absolute path or null
+     * @return \string|null An absolute path or null
      */
     public function getClassPath($class)
     {
@@ -500,7 +501,7 @@ public static function make()
 
         require_once $libDir.'/util/sfFinder.class.php';
 
-        $files = sfFinder::type('file')
+        $files = \sfFinder::type('file')
             ->prune('plugins')
             ->prune('vendor')
             ->prune('skeleton')
@@ -515,7 +516,7 @@ public static function make()
         $classes = '';
         foreach ($files as $file) {
             $file = str_replace(DIRECTORY_SEPARATOR, '/', $file);
-            $class = basename($file, false === strpos($file, '.class.php') ? '.php' : '.class.php');
+            $class = basename($file, !str_contains($file, '.class.php') ? '.php' : '.class.php');
 
             $contents = file_get_contents($file);
             if (false !== stripos($contents, 'class '.$class)
diff --git a/lib/autoload/sfSimpleAutoload.class.php b/lib/autoload/sfSimpleAutoload.class.php
index 05c3983c7..475afa5a7 100755
--- a/lib/autoload/sfSimpleAutoload.class.php
+++ b/lib/autoload/sfSimpleAutoload.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,10 +27,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)
     {
@@ -45,12 +46,12 @@ protected function __construct($cacheFile = null)
      *
      * @param string $cacheFile The file path to save the cache
      *
-     * @return sfSimpleAutoload a sfSimpleAutoload implementation instance
+     * @return \sfSimpleAutoload a sfSimpleAutoload implementation instance
      */
     public static function getInstance($cacheFile = null)
     {
         if (!isset(self::$instance)) {
-            self::$instance = new sfSimpleAutoload($cacheFile);
+            self::$instance = new \sfSimpleAutoload($cacheFile);
         }
 
         return self::$instance;
@@ -59,7 +60,7 @@ public static function getInstance($cacheFile = null)
     /**
      * Register sfSimpleAutoload in spl autoloader.
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public static function register()
     {
@@ -68,12 +69,12 @@ public static function register()
         }
 
         ini_set('unserialize_callback_func', 'spl_autoload_call');
-        if (false === spl_autoload_register(array(self::getInstance(), 'autoload'))) {
-            throw new sfException(sprintf('Unable to register %s::autoload as an autoloading method.', get_class(self::getInstance())));
+        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;
@@ -84,7 +85,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;
     }
 
@@ -108,10 +109,10 @@ public function autoload($class)
         if (isset($this->classes[$class])) {
             try {
                 require $this->classes[$class];
-            } catch (sfException $e) {
+            } catch (\sfException $e) {
                 $e->printStackTrace();
-            } catch (Exception $e) {
-                sfException::createFromException($e)->printStackTrace();
+            } catch (\Exception $e) {
+                \sfException::createFromException($e)->printStackTrace();
             }
 
             return true;
@@ -142,7 +143,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;
@@ -154,7 +155,7 @@ public function saveCache()
      */
     public function reload()
     {
-        $this->classes = array();
+        $this->classes = [];
         $this->cacheLoaded = false;
 
         foreach ($this->dirs as $dir) {
@@ -189,7 +190,7 @@ public function removeCache()
      */
     public function addDirectory($dir, $ext = '.php')
     {
-        $finder = sfFinder::type('file')->follow_link()->name('*'.$ext);
+        $finder = \sfFinder::type('file')->follow_link()->name('*'.$ext);
 
         if ($dirs = glob($dir)) {
             foreach ($dirs as $dir) {
@@ -275,7 +276,7 @@ public function setClassPath($class, $path)
      *
      * @param string $class A PHP class name
      *
-     * @return string|null An absolute path
+     * @return \string|null An absolute path
      */
     public function getClassPath($class)
     {
@@ -289,11 +290,11 @@ public function getClassPath($class)
      *
      * @param array $files An array of autoload.yml files
      *
-     * @see sfAutoloadConfigHandler
+     * @see \sfAutoloadConfigHandler
      */
     public function loadConfiguration(array $files)
     {
-        $config = new sfAutoloadConfigHandler();
+        $config = new \sfAutoloadConfigHandler();
         foreach ($config->evaluate($files) as $class => $file) {
             $this->setClassPath($class, $file);
         }
diff --git a/lib/cache/sfAPCCache.class.php b/lib/cache/sfAPCCache.class.php
index 721bea021..abaaf0edc 100644
--- a/lib/cache/sfAPCCache.class.php
+++ b/lib/cache/sfAPCCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfAPCCache extends sfCache
+class sfAPCCache extends \sfCache
 {
     protected $enabled;
 
@@ -26,9 +27,9 @@ class sfAPCCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 
@@ -36,9 +37,9 @@ public function initialize($options = array())
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -52,7 +53,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -66,9 +67,9 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -80,7 +81,7 @@ public function set($key, $data, $lifetime = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -92,21 +93,21 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
         if (!$this->enabled) {
             return true;
         }
 
-        if (sfCache::ALL === $mode) {
+        if (\sfCache::ALL === $mode) {
             return apc_clear_cache('user');
         }
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -118,7 +119,7 @@ public function getLastModified($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
@@ -130,7 +131,7 @@ public function getTimeout($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
diff --git a/lib/cache/sfAPCuCache.class.php b/lib/cache/sfAPCuCache.class.php
index fe813331c..90ac62419 100644
--- a/lib/cache/sfAPCuCache.class.php
+++ b/lib/cache/sfAPCuCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfAPCuCache extends sfCache
+class sfAPCuCache extends \sfCache
 {
     protected $enabled;
 
@@ -27,9 +28,9 @@ class sfAPCuCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 
@@ -37,9 +38,9 @@ public function initialize($options = array())
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -53,7 +54,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -67,9 +68,9 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -81,7 +82,7 @@ public function set($key, $data, $lifetime = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -93,21 +94,21 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
         if (!$this->enabled) {
             return true;
         }
 
-        if (sfCache::ALL === $mode) {
+        if (\sfCache::ALL === $mode) {
             return apcu_clear_cache();
         }
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -119,7 +120,7 @@ public function getLastModified($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
@@ -131,7 +132,7 @@ public function getTimeout($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
diff --git a/lib/cache/sfCache.class.php b/lib/cache/sfCache.class.php
index 99832f2e5..b586c9c72 100644
--- a/lib/cache/sfCache.class.php
+++ b/lib/cache/sfCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,7 +22,7 @@ abstract class sfCache
     public const ALL = 2;
     public const SEPARATOR = ':';
 
-    protected $options = array();
+    protected $options = [];
 
     /**
      * Class constructor.
@@ -30,7 +31,7 @@ abstract class sfCache
      *
      * @param array $options
      */
-    public function __construct($options = array())
+    public function __construct($options = [])
     {
         $this->initialize($options);
     }
@@ -50,15 +51,15 @@ public function __construct($options = array())
      *
      * * lifetime (optional): The default life time (default value: 86400)
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfCache instance
+     * @throws \sfInitializationException If an error occurs while initializing this sfCache instance
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'automatic_cleaning_factor' => 1000,
             'lifetime' => 86400,
             'prefix' => md5(__DIR__),
-        ), $options);
+        ], $options);
 
         $this->options['prefix'] .= self::SEPARATOR;
     }
@@ -109,7 +110,7 @@ abstract public function remove($key);
      *
      * @return bool true if no problem
      *
-     * @see patternToRegexp
+     * @see \patternToRegexp
      */
     abstract public function removePattern($pattern);
 
@@ -151,7 +152,7 @@ abstract public function getLastModified($key);
      */
     public function getMany($keys)
     {
-        $data = array();
+        $data = [];
         foreach ($keys as $key) {
             $data[$key] = $this->get($key);
         }
@@ -176,11 +177,11 @@ public function getLifetime($lifetime)
      *
      * @return mixed The backend object
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function getBackend()
     {
-        throw new sfException('This cache class does not have a backend object.');
+        throw new \sfException('This cache class does not have a backend object.');
     }
 
     /**
@@ -222,8 +223,8 @@ public function setOption($name, $value)
     protected function patternToRegexp($pattern)
     {
         $regexp = str_replace(
-            array('\\*\\*', '\\*'),
-            array('.+?', '[^'.preg_quote(sfCache::SEPARATOR, '#').']+'),
+            ['\\*\\*', '\\*'],
+            ['.+?', '[^'.preg_quote(\sfCache::SEPARATOR, '#').']+'],
             preg_quote($pattern, '#')
         );
 
diff --git a/lib/cache/sfEAcceleratorCache.class.php b/lib/cache/sfEAcceleratorCache.class.php
index c97092456..c9c3dad5f 100644
--- a/lib/cache/sfEAcceleratorCache.class.php
+++ b/lib/cache/sfEAcceleratorCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfEAcceleratorCache extends sfCache
+class sfEAcceleratorCache extends \sfCache
 {
     /**
      * Initializes this sfCache instance.
@@ -24,28 +25,28 @@ class sfEAcceleratorCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      *
      * @param array $options
      *
-     * @throws sfInitializationException
+     * @throws \sfInitializationException
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 
         if (!function_exists('eaccelerator_put') || !ini_get('eaccelerator.enable')) {
-            throw new sfInitializationException('You must have EAccelerator installed and enabled to use sfEAcceleratorCache class (or perhaps you forgot to add --with-eaccelerator-shared-memory when installing).');
+            throw new \sfInitializationException('You must have EAccelerator installed and enabled to use sfEAcceleratorCache class (or perhaps you forgot to add --with-eaccelerator-shared-memory when installing).');
         }
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param string     $key
-     * @param mixed|null $default
+     * @param string      $key
+     * @param \mixed|null $default
      *
-     * @return string|null
+     * @return \string|null
      */
     public function get($key, $default = null)
     {
@@ -55,7 +56,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
      * @param string $key
      *
@@ -67,11 +68,11 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param string   $key
-     * @param string   $data
-     * @param int|null $lifetime
+     * @param string    $key
+     * @param string    $data
+     * @param \int|null $lifetime
      *
      * @return bool
      */
@@ -81,7 +82,7 @@ public function set($key, $data, $lifetime = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -89,7 +90,7 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
@@ -107,20 +108,20 @@ public function removePattern($pattern)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
-        if (sfCache::OLD === $mode) {
+        if (\sfCache::OLD === $mode) {
             return eaccelerator_gc();
         }
 
         $infos = eaccelerator_list_keys();
         if (is_array($infos)) {
             foreach ($infos as $info) {
-                if (false !== strpos($info['name'], $this->getOption('prefix'))) {
+                if (str_contains($info['name'], $this->getOption('prefix'))) {
                     // eaccelerator bug (http://eaccelerator.net/ticket/287)
-                    $key = 0 === strpos($info['name'], ':') ? substr($info['name'], 1) : $info['name'];
+                    $key =   str_starts_with($info['name'], ':') ? substr($info['name'], 1) : $info['name'];
                     if (!eaccelerator_rm($key)) {
                         return false;
                     }
@@ -132,7 +133,7 @@ public function clean($mode = sfCache::ALL)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -144,7 +145,7 @@ public function getLastModified($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php
index 11d2d3c84..5f02b51d0 100644
--- a/lib/cache/sfFileCache.class.php
+++ b/lib/cache/sfFileCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfFileCache extends sfCache
+class sfFileCache extends \sfCache
 {
     public const READ_DATA = 1;
     public const READ_TIMEOUT = 2;
@@ -32,23 +33,23 @@ class sfFileCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 
         if (!$this->getOption('cache_dir')) {
-            throw new sfInitializationException('You must pass a "cache_dir" option to initialize a sfFileCache object.');
+            throw new \sfInitializationException('You must pass a "cache_dir" option to initialize a sfFileCache object.');
         }
 
         $this->setcache_dir($this->getOption('cache_dir'));
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -67,7 +68,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -77,21 +78,21 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
         if ($this->getOption('automatic_cleaning_factor') > 0 && 1 == mt_rand(1, $this->getOption('automatic_cleaning_factor'))) {
-            $this->clean(sfCache::OLD);
+            $this->clean(\sfCache::OLD);
         }
 
         return $this->write($this->getFilePath($key), $data, time() + $this->getLifetime($lifetime));
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -99,27 +100,27 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
-        if (false !== strpos($pattern, '**')) {
-            $pattern = str_replace(sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $pattern).self::EXTENSION;
+        if (str_contains($pattern, '**')) {
+            $pattern = str_replace(\sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $pattern).self::EXTENSION;
 
             $regexp = self::patternToRegexp($pattern);
-            $paths = array();
-            foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->getOption('cache_dir'))) as $path) {
+            $paths = [];
+            foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getOption('cache_dir'))) as $path) {
                 if (preg_match($regexp, str_replace($this->getOption('cache_dir').DIRECTORY_SEPARATOR, '', $path))) {
                     $paths[] = $path;
                 }
             }
         } else {
-            $paths = glob($this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $pattern).self::EXTENSION);
+            $paths = glob($this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(\sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $pattern).self::EXTENSION);
         }
 
         foreach ($paths as $path) {
             if (is_dir($path)) {
-                sfToolkit::clearDirectory($path);
+                \sfToolkit::clearDirectory($path);
             } else {
                 @unlink($path);
             }
@@ -127,17 +128,17 @@ public function removePattern($pattern)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
         if (!is_dir($this->getOption('cache_dir'))) {
             return true;
         }
 
         $result = true;
-        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->getOption('cache_dir'))) as $file) {
-            if (sfCache::ALL == $mode || !$this->isValid($file)) {
+        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getOption('cache_dir'))) as $file) {
+            if (\sfCache::ALL == $mode || !$this->isValid($file)) {
                 $result = @unlink($file) && $result;
             }
         }
@@ -146,7 +147,7 @@ public function clean($mode = sfCache::ALL)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
@@ -162,7 +163,7 @@ public function getTimeout($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -197,7 +198,7 @@ protected function isValid($path)
      */
     protected function getFilePath($key)
     {
-        return $this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $key).self::EXTENSION;
+        return $this->getOption('cache_dir').DIRECTORY_SEPARATOR.str_replace(\sfCache::SEPARATOR, DIRECTORY_SEPARATOR, $key).self::EXTENSION;
     }
 
     /**
@@ -211,12 +212,12 @@ protected function getFilePath($key)
      *
      * @return array the (meta)data of the cache file. E.g. $data[sfFileCache::READ_DATA]
      *
-     * @throws sfCacheException
+     * @throws \sfCacheException
      */
     protected function read($path, $type = self::READ_DATA)
     {
         if (!$fp = @fopen($path, 'rb')) {
-            throw new sfCacheException(sprintf('Unable to read cache file "%s".', $path));
+            throw new \sfCacheException(sprintf('Unable to read cache file "%s".', $path));
         }
 
         @flock($fp, LOCK_SH);
@@ -255,7 +256,7 @@ protected function read($path, $type = self::READ_DATA)
      *
      * @return bool true if ok, otherwise false
      *
-     * @throws sfCacheException
+     * @throws \sfCacheException
      */
     protected function write($path, $data, $timeout)
     {
@@ -270,7 +271,7 @@ protected function write($path, $data, $timeout)
         $tmpFile = tempnam($cacheDir, basename($path));
 
         if (!$fp = @fopen($tmpFile, 'wb')) {
-            throw new sfCacheException(sprintf('Unable to write cache file "%s".', $tmpFile));
+            throw new \sfCacheException(sprintf('Unable to write cache file "%s".', $tmpFile));
         }
 
         @fwrite($fp, str_pad($timeout, 12, 0, STR_PAD_LEFT));
diff --git a/lib/cache/sfFunctionCache.class.php b/lib/cache/sfFunctionCache.class.php
index 08da5f124..3295aaff1 100644
--- a/lib/cache/sfFunctionCache.class.php
+++ b/lib/cache/sfFunctionCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,9 +23,9 @@ class sfFunctionCache
     /**
      * Constructor.
      *
-     * @param sfCache $cache An sfCache object instance
+     * @param \sfCache $cache An sfCache object instance
      */
-    public function __construct(sfCache $cache)
+    public function __construct(\sfCache $cache)
     {
         $this->cache = $cache;
     }
@@ -44,10 +45,10 @@ public function __construct(sfCache $cache)
      *
      * @return mixed The result of the function/method
      *
-     * @throws Exception
-     * @throws sfException
+     * @throws \Exception
+     * @throws \sfException
      */
-    public function call($callable, $arguments = array())
+    public function call($callable, $arguments = [])
     {
         // Generate a cache id
         $key = $this->computeCacheKey($callable, $arguments);
@@ -56,10 +57,10 @@ public function call($callable, $arguments = array())
         if (null !== $serialized) {
             $data = unserialize($serialized);
         } else {
-            $data = array();
+            $data = [];
 
             if (!is_callable($callable)) {
-                throw new sfException('The first argument to call() must be a valid callable.');
+                throw new \sfException('The first argument to call() must be a valid callable.');
             }
 
             ob_start();
@@ -67,7 +68,7 @@ public function call($callable, $arguments = array())
 
             try {
                 $data['result'] = call_user_func_array($callable, $arguments);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 ob_end_clean();
 
                 throw $e;
@@ -86,7 +87,7 @@ public function call($callable, $arguments = array())
     /**
      * Returns the cache instance.
      *
-     * @return sfCache The sfCache instance
+     * @return \sfCache The sfCache instance
      */
     public function getCache()
     {
@@ -101,7 +102,7 @@ public function getCache()
      *
      * @return string The associated cache key
      */
-    public function computeCacheKey($callable, $arguments = array())
+    public function computeCacheKey($callable, $arguments = [])
     {
         return md5(serialize($callable).serialize($arguments));
     }
diff --git a/lib/cache/sfMemcacheCache.class.php b/lib/cache/sfMemcacheCache.class.php
index 7d69a6336..725cbc9ef 100644
--- a/lib/cache/sfMemcacheCache.class.php
+++ b/lib/cache/sfMemcacheCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfMemcacheCache extends sfCache
+class sfMemcacheCache extends \sfCache
 {
-    /** @var Memcache */
+    /** @var \Memcache */
     protected $memcache;
 
     /**
@@ -35,41 +36,41 @@ class sfMemcacheCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 
         if (!class_exists('Memcache')) {
-            throw new sfInitializationException('You must have memcache installed and enabled to use sfMemcacheCache class.');
+            throw new \sfInitializationException('You must have memcache installed and enabled to use sfMemcacheCache class.');
         }
 
         if ($this->getOption('memcache')) {
             $this->memcache = $this->getOption('memcache');
         } else {
-            $this->memcache = new Memcache();
+            $this->memcache = new \Memcache();
 
             if ($this->getOption('servers')) {
                 foreach ($this->getOption('servers') as $server) {
                     $port = isset($server['port']) ? $server['port'] : 11211;
                     if (!$this->memcache->addServer($server['host'], $port, isset($server['persistent']) ? $server['persistent'] : true)) {
-                        throw new sfInitializationException(sprintf('Unable to connect to the memcache server (%s:%s).', $server['host'], $port));
+                        throw new \sfInitializationException(sprintf('Unable to connect to the memcache server (%s:%s).', $server['host'], $port));
                     }
                 }
             } else {
                 $method = $this->getOption('persistent', true) ? 'pconnect' : 'connect';
                 if (!$this->memcache->{$method}($this->getOption('host', 'localhost'), $this->getOption('port', 11211), $this->getOption('timeout', 1))) {
-                    throw new sfInitializationException(sprintf('Unable to connect to the memcache server (%s:%s).', $this->getOption('host', 'localhost'), $this->getOption('port', 11211)));
+                    throw new \sfInitializationException(sprintf('Unable to connect to the memcache server (%s:%s).', $this->getOption('host', 'localhost'), $this->getOption('port', 11211)));
                 }
             }
         }
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @return Memcache
+     * @return \Memcache
      */
     public function getBackend()
     {
@@ -77,9 +78,9 @@ public function getBackend()
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -89,7 +90,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -102,9 +103,9 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -126,7 +127,7 @@ public function set($key, $data, $lifetime = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -140,17 +141,17 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
-        if (sfCache::ALL === $mode) {
+        if (\sfCache::ALL === $mode) {
             return $this->memcache->flush();
         }
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -162,7 +163,7 @@ public function getLastModified($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
@@ -174,14 +175,14 @@ public function getTimeout($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @throws sfCacheException
+     * @throws \sfCacheException
      */
     public function removePattern($pattern)
     {
         if (!$this->getOption('storeCacheInfo', false)) {
-            throw new sfCacheException('To use the "removePattern" method, you must set the "storeCacheInfo" option to "true".');
+            throw new \sfCacheException('To use the "removePattern" method, you must set the "storeCacheInfo" option to "true".');
         }
 
         $regexp = self::patternToRegexp($this->getOption('prefix').$pattern);
@@ -193,11 +194,11 @@ public function removePattern($pattern)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getMany($keys)
     {
-        $values = array();
+        $values = [];
         $prefix = $this->getOption('prefix');
         $prefixed_keys = array_map(function ($k) use ($prefix) { return $prefix.$k; }, $keys);
 
@@ -228,7 +229,7 @@ protected function getMetadata($key)
      */
     protected function setMetadata($key, $lifetime)
     {
-        $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, time() + $lifetime);
+        $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, ['lastModified' => time(), 'timeout' => time() + $lifetime], false, time() + $lifetime);
     }
 
     /**
@@ -241,7 +242,7 @@ protected function setCacheInfo($key, $delete = false)
     {
         $keys = $this->memcache->get($this->getOption('prefix').'_metadata');
         if (!is_array($keys)) {
-            $keys = array();
+            $keys = [];
         }
 
         if ($delete) {
@@ -266,7 +267,7 @@ protected function getCacheInfo()
     {
         $keys = $this->memcache->get($this->getOption('prefix').'_metadata');
         if (!is_array($keys)) {
-            return array();
+            return [];
         }
 
         return $keys;
diff --git a/lib/cache/sfNoCache.class.php b/lib/cache/sfNoCache.class.php
index 10d62b188..20a8ca3ad 100644
--- a/lib/cache/sfNoCache.class.php
+++ b/lib/cache/sfNoCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,12 +16,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfNoCache extends sfCache
+class sfNoCache extends \sfCache
 {
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -28,7 +29,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -36,9 +37,9 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
@@ -46,7 +47,7 @@ public function set($key, $data, $lifetime = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -54,7 +55,7 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
@@ -62,7 +63,7 @@ public function removePattern($pattern)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function clean($mode = self::ALL)
     {
@@ -70,7 +71,7 @@ public function clean($mode = self::ALL)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -78,7 +79,7 @@ public function getLastModified($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
diff --git a/lib/cache/sfSQLiteCache.class.php b/lib/cache/sfSQLiteCache.class.php
index 5200cb60d..fa790233b 100644
--- a/lib/cache/sfSQLiteCache.class.php
+++ b/lib/cache/sfSQLiteCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfSQLiteCache extends sfCache
+class sfSQLiteCache extends \sfCache
 {
     protected $dbh;
     protected $sqlLiteVersion;
@@ -30,25 +31,25 @@ class sfSQLiteCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
-            throw new sfConfigurationException('sfSQLiteCache class needs "sqlite" or "pdo_sqlite" extension to be loaded.');
+            throw new \sfConfigurationException('sfSQLiteCache class needs "sqlite" or "pdo_sqlite" extension to be loaded.');
         }
 
         parent::initialize($options);
 
         if (!$this->getOption('database')) {
-            throw new sfInitializationException('You must pass a "database" option to initialize a sfSQLiteCache object.');
+            throw new \sfInitializationException('You must pass a "database" option to initialize a sfSQLiteCache object.');
         }
 
         $this->setDatabase($this->getOption('database'));
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
      * @inheritdo
      *
@@ -60,9 +61,9 @@ public function getBackend()
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -76,7 +77,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -88,14 +89,14 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
         if ($this->getOption('automatic_cleaning_factor') > 0 && 1 == mt_rand(1, $this->getOption('automatic_cleaning_factor'))) {
-            $this->clean(sfCache::OLD);
+            $this->clean(\sfCache::OLD);
         }
 
         if ($this->isSqLite3()) {
@@ -106,7 +107,7 @@ public function set($key, $data, $lifetime = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -118,7 +119,7 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
@@ -130,12 +131,12 @@ public function removePattern($pattern)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
         if ($this->isSqLite3()) {
-            $res = $this->dbh->exec('DELETE FROM cache'.(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
+            $res = $this->dbh->exec('DELETE FROM cache'.(\sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
 
             if ($res) {
                 return (bool) $this->dbh->changes();
@@ -144,11 +145,11 @@ public function clean($mode = sfCache::ALL)
             return false;
         }
 
-        return (bool) $this->dbh->query('DELETE FROM cache'.(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''))->numRows();
+        return (bool) $this->dbh->query('DELETE FROM cache'.(\sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''))->numRows();
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
@@ -164,7 +165,7 @@ public function getTimeout($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -193,13 +194,13 @@ public function removePatternRegexpCallback($regexp, $key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getMany($keys)
     {
         if ($this->isSqLite3()) {
-            $data = array();
-            if ($results = $this->dbh->query(sprintf("SELECT key, data FROM cache WHERE key IN ('%s') AND timeout > %d", implode('\', \'', array_map(array($this->dbh, 'escapeString'), $keys)), time()))) {
+            $data = [];
+            if ($results = $this->dbh->query(sprintf("SELECT key, data FROM cache WHERE key IN ('%s') AND timeout > %d", implode('\', \'', array_map([$this->dbh, 'escapeString'], $keys)), time()))) {
                 while ($row = $results->fetchArray()) {
                     $data[$row['key']] = $row['data'];
                 }
@@ -210,7 +211,7 @@ public function getMany($keys)
 
         $rows = $this->dbh->arrayQuery(sprintf("SELECT key, data FROM cache WHERE key IN ('%s') AND timeout > %d", implode('\', \'', array_map('sqlite_escape_string', $keys)), time()));
 
-        $data = array();
+        $data = [];
         foreach ($rows as $row) {
             $data[$row['key']] = $row['data'];
         }
@@ -223,7 +224,7 @@ public function getMany($keys)
      *
      * @param string $database The database name where to store the cache
      *
-     * @throws sfCacheException
+     * @throws \sfCacheException
      */
     protected function setDatabase($database)
     {
@@ -247,17 +248,17 @@ protected function setDatabase($database)
         }
 
         if ($this->isSqLite3()) {
-            $this->dbh = new SQLite3($this->database);
+            $this->dbh = new \SQLite3($this->database);
             if ('not an error' !== $errmsg = $this->dbh->lastErrorMsg()) {
-                throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
+                throw new \sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
             }
         } else {
-            if (!$this->dbh = new SQLiteDatabase($this->database, 0644, $errmsg)) {
-                throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
+            if (!$this->dbh = new \SQLiteDatabase($this->database, 0644, $errmsg)) {
+                throw new \sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
             }
         }
 
-        $this->dbh->createFunction('regexp', array($this, 'removePatternRegexpCallback'), 2);
+        $this->dbh->createFunction('regexp', [$this, 'removePatternRegexpCallback'], 2);
 
         if ($new) {
             $this->createSchema();
@@ -267,11 +268,11 @@ protected function setDatabase($database)
     /**
      * Creates the database schema.
      *
-     * @throws sfCacheException
+     * @throws \sfCacheException
      */
     protected function createSchema()
     {
-        $statements = array(
+        $statements = [
             'CREATE TABLE [cache] (
         [key] VARCHAR(255),
         [data] LONGVARCHAR,
@@ -279,13 +280,13 @@ protected function createSchema()
         [last_modified] TIMESTAMP
       )',
             'CREATE UNIQUE INDEX [cache_unique] ON [cache] ([key])',
-        );
+        ];
 
         foreach ($statements as $statement) {
             if (false === $this->dbh->query($statement)) {
                 $message = $this->isSqLite3() ? $this->dbh->lastErrorMsg() : sqlite_error_string($this->dbh->lastError());
 
-                throw new sfCacheException($message);
+                throw new \sfCacheException($message);
             }
         }
     }
diff --git a/lib/cache/sfXCacheCache.class.php b/lib/cache/sfXCacheCache.class.php
index 8c5c53e5e..c87b241be 100644
--- a/lib/cache/sfXCacheCache.class.php
+++ b/lib/cache/sfXCacheCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfXCacheCache extends sfCache
+class sfXCacheCache extends \sfCache
 {
     /**
      * Initializes this sfCache instance.
@@ -24,25 +25,25 @@ class sfXCacheCache extends sfCache
      *
      * * see sfCache for options available for all drivers
      *
-     * @see sfCache
+     * @see \sfCache
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         parent::initialize($options);
 
         if (!function_exists('xcache_set')) {
-            throw new sfInitializationException('You must have XCache installed and enabled to use sfXCacheCache class.');
+            throw new \sfInitializationException('You must have XCache installed and enabled to use sfXCacheCache class.');
         }
 
         if (!ini_get('xcache.var_size')) {
-            throw new sfInitializationException('You must set the "xcache.var_size" variable to a value greater than 0 to use sfXCacheCache class.');
+            throw new \sfInitializationException('You must set the "xcache.var_size" variable to a value greater than 0 to use sfXCacheCache class.');
         }
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $default
+     * @param \mixed|null $default
      */
     public function get($key, $default = null)
     {
@@ -56,7 +57,7 @@ public function get($key, $default = null)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function has($key)
     {
@@ -64,25 +65,25 @@ public function has($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      *
-     * @param mixed|null $lifetime
+     * @param \mixed|null $lifetime
      */
     public function set($key, $data, $lifetime = null)
     {
         $lifetime = $this->getLifetime($lifetime);
 
-        $set = array(
+        $set = [
             'timeout' => time() + $lifetime,
             'data' => $data,
             'ctime' => time(),
-        );
+        ];
 
         return xcache_set($this->getOption('prefix').$key, $set, $lifetime);
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function remove($key)
     {
@@ -90,11 +91,11 @@ public function remove($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
-        if (sfCache::ALL !== $mode) {
+        if (\sfCache::ALL !== $mode) {
             return true;
         }
 
@@ -110,7 +111,7 @@ public function clean($mode = sfCache::ALL)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getLastModified($key)
     {
@@ -124,7 +125,7 @@ public function getLastModified($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function getTimeout($key)
     {
@@ -140,7 +141,7 @@ public function getTimeout($key)
     /**
      * @param string $key
      *
-     * @return mixed|null
+     * @return \mixed|null
      */
     public function getBaseValue($key)
     {
@@ -148,7 +149,7 @@ public function getBaseValue($key)
     }
 
     /**
-     * @see sfCache
+     * @see \sfCache
      */
     public function removePattern($pattern)
     {
@@ -173,7 +174,7 @@ public function removePattern($pattern)
     /**
      * @param string $key
      *
-     * @return array|null
+     * @return \array|null
      */
     public function getCacheInfo($key)
     {
@@ -197,7 +198,7 @@ public function getCacheInfo($key)
     protected function checkAuth()
     {
         if (ini_get('xcache.admin.enable_auth')) {
-            throw new sfConfigurationException('To use all features of the "sfXCacheCache" class, you must set "xcache.admin.enable_auth" to "Off" in your php.ini.');
+            throw new \sfConfigurationException('To use all features of the "sfXCacheCache" class, you must set "xcache.admin.enable_auth" to "Off" in your php.ini.');
         }
     }
 }
diff --git a/lib/command/cli.php b/lib/command/cli.php
index 8b423443c..645f603a7 100644
--- a/lib/command/cli.php
+++ b/lib/command/cli.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,18 +17,18 @@
 // Fall back to classic Symfony loading
 if (!file_exists($autoload)) {
     require_once __DIR__.'/../autoload/sfCoreAutoload.class.php';
-    sfCoreAutoload::register();
+    \sfCoreAutoload::register();
 } else {
     require_once $autoload;
 }
 
 try {
-    $dispatcher = new sfEventDispatcher();
-    $logger = new sfCommandLogger($dispatcher);
+    $dispatcher = new \sfEventDispatcher();
+    $logger = new \sfCommandLogger($dispatcher);
 
-    $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(__DIR__.'/..')));
+    $application = new \sfSymfonyCommandApplication($dispatcher, null, ['symfony_lib_dir' => realpath(__DIR__.'/..')]);
     $statusCode = $application->run();
-} catch (Exception $e) {
+} catch (\Exception $e) {
     if (!isset($application)) {
         throw $e;
     }
diff --git a/lib/command/sfAnsiColorFormatter.class.php b/lib/command/sfAnsiColorFormatter.class.php
index bae2f2406..e7a3586bc 100644
--- a/lib/command/sfAnsiColorFormatter.class.php
+++ b/lib/command/sfAnsiColorFormatter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfAnsiColorFormatter extends sfFormatter
+class sfAnsiColorFormatter extends \sfFormatter
 {
-    protected $styles = array(
-        'ERROR' => array('bg' => 'red', 'fg' => 'white', 'bold' => true),
-        'INFO' => array('fg' => 'green', 'bold' => true),
-        'COMMENT' => array('fg' => 'yellow'),
-        'QUESTION' => array('bg' => 'cyan', 'fg' => 'black', 'bold' => false),
-    );
-    protected $options = array('bold' => 1, 'underscore' => 4, 'blink' => 5, 'reverse' => 7, 'conceal' => 8);
-    protected $foreground = array('black' => 30, 'red' => 31, 'green' => 32, 'yellow' => 33, 'blue' => 34, 'magenta' => 35, 'cyan' => 36, 'white' => 37);
-    protected $background = array('black' => 40, 'red' => 41, 'green' => 42, 'yellow' => 43, 'blue' => 44, 'magenta' => 45, 'cyan' => 46, 'white' => 47);
+    protected $styles = [
+        'ERROR' => ['bg' => 'red', 'fg' => 'white', 'bold' => true],
+        'INFO' => ['fg' => 'green', 'bold' => true],
+        'COMMENT' => ['fg' => 'yellow'],
+        'QUESTION' => ['bg' => 'cyan', 'fg' => 'black', 'bold' => false],
+    ];
+    protected $options = ['bold' => 1, 'underscore' => 4, 'blink' => 5, 'reverse' => 7, 'conceal' => 8];
+    protected $foreground = ['black' => 30, 'red' => 31, 'green' => 32, 'yellow' => 33, 'blue' => 34, 'magenta' => 35, 'cyan' => 36, 'white' => 37];
+    protected $background = ['black' => 40, 'red' => 41, 'green' => 42, 'yellow' => 43, 'blue' => 44, 'magenta' => 45, 'cyan' => 46, 'white' => 47];
 
     /**
      * Sets a new style.
@@ -33,7 +34,7 @@ class sfAnsiColorFormatter extends sfFormatter
      * @param string $name    The style name
      * @param array  $options An array of options
      */
-    public function setStyle($name, $options = array())
+    public function setStyle($name, $options = [])
     {
         $this->styles[$name] = $options;
     }
@@ -46,7 +47,7 @@ public function setStyle($name, $options = array())
      *
      * @return string The styled text
      */
-    public function format($text = '', $parameters = array())
+    public function format($text = '', $parameters = [])
     {
         if (!is_array($parameters) && 'NONE' == $parameters) {
             return $text;
@@ -56,7 +57,7 @@ public function format($text = '', $parameters = array())
             $parameters = $this->styles[$parameters];
         }
 
-        $codes = array();
+        $codes = [];
         if (isset($parameters['fg'])) {
             $codes[] = $this->foreground[$parameters['fg']];
         }
diff --git a/lib/command/sfCommandApplication.class.php b/lib/command/sfCommandApplication.class.php
index c232f2ae5..f0e497f1b 100644
--- a/lib/command/sfCommandApplication.class.php
+++ b/lib/command/sfCommandApplication.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  */
 abstract class sfCommandApplication
 {
-    /** @var sfCommandManager */
+    /** @var \sfCommandManager */
     protected $commandManager;
 
     /** @var bool */
@@ -39,18 +40,18 @@ abstract class sfCommandApplication
     protected $version = 'UNKNOWN';
 
     /** @var array */
-    protected $tasks = array();
+    protected $tasks = [];
 
-    /** @var sfTask */
+    /** @var \sfTask */
     protected $currentTask;
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
     /** @var array */
-    protected $options = array();
+    protected $options = [];
 
-    /** @var sfFormatter */
+    /** @var \sfFormatter */
     protected $formatter;
 
     protected $commandOptions;
@@ -58,11 +59,11 @@ abstract class sfCommandApplication
     /**
      * Constructor.
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param sfFormatter       $formatter  A sfFormatter instance
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param \sfFormatter       $formatter  A sfFormatter instance
+     * @param array              $options    An array of options
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter = null, $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, \sfFormatter $formatter = null, $options = [])
     {
         $this->dispatcher = $dispatcher;
         $this->formatter = null === $formatter ? $this->guessBestFormatter(STDOUT) : $formatter;
@@ -70,18 +71,18 @@ public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatte
 
         $this->fixCgi();
 
-        $argumentSet = new sfCommandArgumentSet(array(
-            new sfCommandArgument('task', sfCommandArgument::REQUIRED, 'The task to execute'),
-        ));
-        $optionSet = new sfCommandOptionSet(array(
-            new sfCommandOption('--help', '-H', sfCommandOption::PARAMETER_NONE, 'Display this help message.'),
-            new sfCommandOption('--quiet', '-q', sfCommandOption::PARAMETER_NONE, 'Do not log messages to standard output.'),
-            new sfCommandOption('--trace', '-t', sfCommandOption::PARAMETER_NONE, 'Turn on invoke/execute tracing, enable full backtrace.'),
-            new sfCommandOption('--version', '-V', sfCommandOption::PARAMETER_NONE, 'Display the program version.'),
-            new sfCommandOption('--color', '', sfCommandOption::PARAMETER_NONE, 'Forces ANSI color output.'),
-            new sfCommandOption('--no-debug', '', sfCommandOption::PARAMETER_NONE, 'Disable debug'),
-        ));
-        $this->commandManager = new sfCommandManager($argumentSet, $optionSet);
+        $argumentSet = new \sfCommandArgumentSet([
+            new \sfCommandArgument('task', \sfCommandArgument::REQUIRED, 'The task to execute'),
+        ]);
+        $optionSet = new \sfCommandOptionSet([
+            new \sfCommandOption('--help', '-H', \sfCommandOption::PARAMETER_NONE, 'Display this help message.'),
+            new \sfCommandOption('--quiet', '-q', \sfCommandOption::PARAMETER_NONE, 'Do not log messages to standard output.'),
+            new \sfCommandOption('--trace', '-t', \sfCommandOption::PARAMETER_NONE, 'Turn on invoke/execute tracing, enable full backtrace.'),
+            new \sfCommandOption('--version', '-V', \sfCommandOption::PARAMETER_NONE, 'Display the program version.'),
+            new \sfCommandOption('--color', '', \sfCommandOption::PARAMETER_NONE, 'Forces ANSI color output.'),
+            new \sfCommandOption('--no-debug', '', \sfCommandOption::PARAMETER_NONE, 'Disable debug'),
+        ]);
+        $this->commandManager = new \sfCommandManager($argumentSet, $optionSet);
 
         $this->configure();
 
@@ -108,7 +109,7 @@ public function getOption($name)
     /**
      * Returns the formatter instance.
      *
-     * @return sfFormatter The formatter instance
+     * @return \sfFormatter The formatter instance
      */
     public function getFormatter()
     {
@@ -118,9 +119,9 @@ public function getFormatter()
     /**
      * Sets the formatter instance.
      *
-     * @param sfFormatter $formatter The formatter instance
+     * @param \sfFormatter $formatter The formatter instance
      */
-    public function setFormatter(sfFormatter $formatter)
+    public function setFormatter(\sfFormatter $formatter)
     {
         $this->formatter = $formatter;
 
@@ -131,7 +132,7 @@ public function setFormatter(sfFormatter $formatter)
 
     public function clearTasks()
     {
-        $this->tasks = array();
+        $this->tasks = [];
     }
 
     /**
@@ -155,21 +156,21 @@ public function registerTasks($tasks = null)
     /**
      * Registers a task object.
      *
-     * @param sfTask $task An sfTask object
+     * @param \sfTask $task An sfTask object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
-    public function registerTask(sfTask $task)
+    public function registerTask(\sfTask $task)
     {
         if (isset($this->tasks[$task->getFullName()])) {
-            throw new sfCommandException(sprintf('The task named "%s" in "%s" task is already registered by the "%s" task.', $task->getFullName(), get_class($task), get_class($this->tasks[$task->getFullName()])));
+            throw new \sfCommandException(sprintf('The task named "%s" in "%s" task is already registered by the "%s" task.', $task->getFullName(), get_class($task), get_class($this->tasks[$task->getFullName()])));
         }
 
         $this->tasks[$task->getFullName()] = $task;
 
         foreach ($task->getAliases() as $alias) {
             if (isset($this->tasks[$alias])) {
-                throw new sfCommandException(sprintf('A task named "%s" is already registered.', $alias));
+                throw new \sfCommandException(sprintf('A task named "%s" is already registered.', $alias));
             }
 
             $this->tasks[$alias] = $task;
@@ -183,9 +184,9 @@ public function registerTask(sfTask $task)
      */
     public function autodiscoverTasks()
     {
-        $tasks = array();
+        $tasks = [];
         foreach (get_declared_classes() as $class) {
-            $r = new ReflectionClass($class);
+            $r = new \ReflectionClass($class);
 
             if ($r->isSubclassOf('sfTask') && !$r->isAbstract()) {
                 $tasks[] = new $class($this->dispatcher, $this->formatter);
@@ -210,14 +211,14 @@ public function getTasks()
      *
      * @param string $name The task name or alias
      *
-     * @return sfTask An sfTask object
+     * @return \sfTask An sfTask object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function getTask($name)
     {
         if (!isset($this->tasks[$name])) {
-            throw new sfCommandException(sprintf('The task "%s" does not exist.', $name));
+            throw new \sfCommandException(sprintf('The task "%s" does not exist.', $name));
         }
 
         return $this->tasks[$name];
@@ -329,11 +330,11 @@ public function isDebug()
      */
     public function help()
     {
-        $messages = array(
+        $messages = [
             $this->formatter->format('Usage:', 'COMMENT'),
             sprintf("  %s [options] task_name [arguments]\n", $this->getName()),
             $this->formatter->format('Options:', 'COMMENT'),
-        );
+        ];
 
         foreach ($this->commandManager->getOptionSet()->getOptions() as $option) {
             $messages[] = sprintf(
@@ -344,25 +345,25 @@ public function help()
             );
         }
 
-        $this->dispatcher->notify(new sfEvent($this, 'command.log', $messages));
+        $this->dispatcher->notify(new \sfEvent($this, 'command.log', $messages));
     }
 
     /**
      * Renders an exception.
      *
-     * @param Exception $e An exception object
+     * @param \Exception $e An exception object
      */
     public function renderException($e)
     {
         $title = sprintf('  [%s]  ', get_class($e));
         $len = $this->strlen($title);
-        $lines = array();
+        $lines = [];
         foreach (explode("\n", $e->getMessage()) as $line) {
             $lines[] = sprintf('  %s  ', $line);
             $len = max($this->strlen($line) + 4, $len);
         }
 
-        $messages = array(str_repeat(' ', $len));
+        $messages = [str_repeat(' ', $len)];
 
         if ($this->trace) {
             $messages[] = $title.str_repeat(' ', $len - $this->strlen($title));
@@ -380,7 +381,7 @@ public function renderException($e)
         }
         fwrite(STDERR, "\n");
 
-        if (null !== $this->currentTask && $e instanceof sfCommandArgumentsException) {
+        if (null !== $this->currentTask && $e instanceof \sfCommandArgumentsException) {
             fwrite(STDERR, $this->formatter->format(sprintf($this->currentTask->getSynopsis(), $this->getName()), 'INFO', STDERR)."\n");
             fwrite(STDERR, "\n");
         }
@@ -390,12 +391,12 @@ public function renderException($e)
 
             // exception related properties
             $trace = $e->getTrace();
-            array_unshift($trace, array(
+            array_unshift($trace, [
                 'function' => '',
                 'file' => null != $e->getFile() ? $e->getFile() : 'n/a',
                 'line' => null != $e->getLine() ? $e->getLine() : 'n/a',
-                'args' => array(),
-            ));
+                'args' => [],
+            ]);
 
             for ($i = 0, $count = count($trace); $i < $count; ++$i) {
                 $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
@@ -410,7 +411,7 @@ public function renderException($e)
             fwrite(STDERR, "\n");
         }
 
-        $this->dispatcher->notify(new sfEvent($e, 'application.throw_exception'));
+        $this->dispatcher->notify(new \sfEvent($e, 'application.throw_exception'));
     }
 
     /**
@@ -418,9 +419,9 @@ public function renderException($e)
      *
      * @param string $name The task name or a task shortcut
      *
-     * @return sfTask A sfTask object
+     * @return \sfTask A sfTask object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function getTaskToExecute($name)
     {
@@ -429,7 +430,7 @@ public function getTaskToExecute($name)
             $namespace = substr($name, 0, $pos);
             $name = substr($name, $pos + 1);
 
-            $namespaces = array();
+            $namespaces = [];
             foreach ($this->tasks as $task) {
                 if ($task->getNamespace() && !in_array($task->getNamespace(), $namespaces)) {
                     $namespaces[] = $task->getNamespace();
@@ -438,10 +439,10 @@ public function getTaskToExecute($name)
             $abbrev = $this->getAbbreviations($namespaces);
 
             if (!isset($abbrev[$namespace])) {
-                throw new sfCommandException(sprintf('There are no tasks defined in the "%s" namespace.', $namespace));
+                throw new \sfCommandException(sprintf('There are no tasks defined in the "%s" namespace.', $namespace));
             }
             if (count($abbrev[$namespace]) > 1) {
-                throw new sfCommandException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, implode(', ', $abbrev[$namespace])));
+                throw new \sfCommandException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, implode(', ', $abbrev[$namespace])));
             }
 
             $namespace = $abbrev[$namespace][0];
@@ -450,7 +451,7 @@ public function getTaskToExecute($name)
         }
 
         // name
-        $tasks = array();
+        $tasks = [];
         foreach ($this->tasks as $taskName => $task) {
             if ($taskName == $task->getFullName() && $task->getNamespace() == $namespace) {
                 $tasks[] = $task->getName();
@@ -463,7 +464,7 @@ public function getTaskToExecute($name)
         }
 
         // aliases
-        $aliases = array();
+        $aliases = [];
         foreach ($this->tasks as $taskName => $task) {
             if ($taskName == $task->getFullName()) {
                 foreach ($task->getAliases() as $alias) {
@@ -475,10 +476,10 @@ public function getTaskToExecute($name)
         $abbrev = $this->getAbbreviations($aliases);
         $fullName = $namespace ? $namespace.':'.$name : $name;
         if (!isset($abbrev[$fullName])) {
-            throw new sfCommandException(sprintf('Task "%s" is not defined.', $fullName));
+            throw new \sfCommandException(sprintf('Task "%s" is not defined.', $fullName));
         }
         if (count($abbrev[$fullName]) > 1) {
-            throw new sfCommandException(sprintf('Task "%s" is ambiguous (%s).', $fullName, implode(', ', $abbrev[$fullName])));
+            throw new \sfCommandException(sprintf('Task "%s" is ambiguous (%s).', $fullName, implode(', ', $abbrev[$fullName])));
         }
 
         return $this->getTask($abbrev[$fullName][0]);
@@ -497,7 +498,7 @@ protected function handleOptions($options = null)
         // the order of option processing matters
 
         if ($this->commandManager->getOptionSet()->hasOption('color') && false !== $this->commandManager->getOptionValue('color')) {
-            $this->setFormatter(new sfAnsiColorFormatter());
+            $this->setFormatter(new \sfAnsiColorFormatter());
         }
 
         if ($this->commandManager->getOptionSet()->hasOption('quiet') && false !== $this->commandManager->getOptionValue('quiet')) {
@@ -559,7 +560,7 @@ protected function fixCgi()
         ini_set('html_errors', false);
         ini_set('magic_quotes_runtime', false);
 
-        if (false === strpos(PHP_SAPI, 'cgi')) {
+        if (!str_contains(PHP_SAPI, 'cgi')) {
             return;
         }
 
@@ -594,8 +595,8 @@ protected function fixCgi()
      */
     protected function getAbbreviations($names)
     {
-        $abbrevs = array();
-        $table = array();
+        $abbrevs = [];
+        $table = [];
 
         foreach ($names as $name) {
             for ($len = strlen($name) - 1; $len > 0; --$len) {
@@ -609,7 +610,7 @@ protected function getAbbreviations($names)
                 $seen = $table[$abbrev];
                 if (1 == $seen) {
                     // We're the first word so far to have this abbreviation.
-                    $abbrevs[$abbrev] = array($name);
+                    $abbrevs[$abbrev] = [$name];
                 } elseif (2 == $seen) {
                     // We're the second word to have this abbreviation, so we can't use it.
                     // unset($abbrevs[$abbrev]);
@@ -623,7 +624,7 @@ protected function getAbbreviations($names)
 
         // Non-abbreviations always get entered, even if they aren't unique
         foreach ($names as $name) {
-            $abbrevs[$name] = array($name);
+            $abbrevs[$name] = [$name];
         }
 
         return $abbrevs;
@@ -655,10 +656,10 @@ protected function isStreamSupportsColors($stream)
      *
      * @param mixed $stream A stream
      *
-     * @return sfFormatter A formatter instance
+     * @return \sfFormatter A formatter instance
      */
     protected function guessBestFormatter($stream)
     {
-        return $this->isStreamSupportsColors($stream) ? new sfAnsiColorFormatter() : new sfFormatter();
+        return $this->isStreamSupportsColors($stream) ? new \sfAnsiColorFormatter() : new \sfFormatter();
     }
 }
diff --git a/lib/command/sfCommandArgument.class.php b/lib/command/sfCommandArgument.class.php
index 380590e80..2e5775233 100644
--- a/lib/command/sfCommandArgument.class.php
+++ b/lib/command/sfCommandArgument.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -35,14 +36,14 @@ class sfCommandArgument
      * @param string $help    A help text
      * @param mixed  $default The default value (for self::OPTIONAL mode only)
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function __construct($name, $mode = null, $help = '', $default = null)
     {
         if (null === $mode) {
             $mode = self::OPTIONAL;
         } elseif (is_string($mode) || $mode > 7) {
-            throw new sfCommandException(sprintf('Argument mode "%s" is not valid.', $mode));
+            throw new \sfCommandException(sprintf('Argument mode "%s" is not valid.', $mode));
         }
 
         $this->name = $name;
@@ -87,19 +88,19 @@ public function isArray()
      *
      * @param mixed $default The default value
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function setDefault($default = null)
     {
         if (self::REQUIRED === $this->mode && null !== $default) {
-            throw new sfCommandException('Cannot set a default value except for sfCommandParameter::OPTIONAL mode.');
+            throw new \sfCommandException('Cannot set a default value except for sfCommandParameter::OPTIONAL mode.');
         }
 
         if ($this->isArray()) {
             if (null === $default) {
-                $default = array();
+                $default = [];
             } elseif (!is_array($default)) {
-                throw new sfCommandException('A default value for an array argument must be an array.');
+                throw new \sfCommandException('A default value for an array argument must be an array.');
             }
         }
 
diff --git a/lib/command/sfCommandArgumentSet.class.php b/lib/command/sfCommandArgumentSet.class.php
index b641a8603..8325e0269 100644
--- a/lib/command/sfCommandArgumentSet.class.php
+++ b/lib/command/sfCommandArgumentSet.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  */
 class sfCommandArgumentSet
 {
-    protected $arguments = array();
+    protected $arguments = [];
     protected $requiredCount = 0;
     protected $hasAnArrayArgument = false;
     protected $hasOptional = false;
@@ -27,7 +28,7 @@ class sfCommandArgumentSet
      *
      * @param array $arguments An array of sfCommandArgument objects
      */
-    public function __construct($arguments = array())
+    public function __construct($arguments = [])
     {
         $this->setArguments($arguments);
     }
@@ -37,9 +38,9 @@ public function __construct($arguments = array())
      *
      * @param array $arguments An array of sfCommandArgument objects
      */
-    public function setArguments($arguments = array())
+    public function setArguments($arguments = [])
     {
-        $this->arguments = array();
+        $this->arguments = [];
         $this->requiredCount = 0;
         $this->hasOptional = false;
         $this->addArguments($arguments);
@@ -50,7 +51,7 @@ public function setArguments($arguments = array())
      *
      * @param array $arguments An array of sfCommandArgument objects
      */
-    public function addArguments($arguments = array())
+    public function addArguments($arguments = [])
     {
         if (null !== $arguments) {
             foreach ($arguments as $argument) {
@@ -62,22 +63,22 @@ public function addArguments($arguments = array())
     /**
      * Add a sfCommandArgument objects.
      *
-     * @param sfCommandArgument $argument A sfCommandArgument object
+     * @param \sfCommandArgument $argument A sfCommandArgument object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
-    public function addArgument(sfCommandArgument $argument)
+    public function addArgument(\sfCommandArgument $argument)
     {
         if (isset($this->arguments[$argument->getName()])) {
-            throw new sfCommandException(sprintf('An argument with name "%s" already exist.', $argument->getName()));
+            throw new \sfCommandException(sprintf('An argument with name "%s" already exist.', $argument->getName()));
         }
 
         if ($this->hasAnArrayArgument) {
-            throw new sfCommandException('Cannot add an argument after an array argument.');
+            throw new \sfCommandException('Cannot add an argument after an array argument.');
         }
 
         if ($argument->isRequired() && $this->hasOptional) {
-            throw new sfCommandException('Cannot add a required argument after an optional one.');
+            throw new \sfCommandException('Cannot add a required argument after an optional one.');
         }
 
         if ($argument->isArray()) {
@@ -98,14 +99,14 @@ public function addArgument(sfCommandArgument $argument)
      *
      * @param string $name The argument name
      *
-     * @return sfCommandArgument A sfCommandArgument object
+     * @return \sfCommandArgument A sfCommandArgument object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function getArgument($name)
     {
         if (!$this->hasArgument($name)) {
-            throw new sfCommandException(sprintf('The "%s" argument does not exist.', $name));
+            throw new \sfCommandException(sprintf('The "%s" argument does not exist.', $name));
         }
 
         return $this->arguments[$name];
@@ -160,7 +161,7 @@ public function getArgumentRequiredCount()
      */
     public function getDefaults()
     {
-        $values = array();
+        $values = [];
         foreach ($this->arguments as $argument) {
             $values[$argument->getName()] = $argument->getDefault();
         }
diff --git a/lib/command/sfCommandArgumentsException.class.php b/lib/command/sfCommandArgumentsException.class.php
index 0dff151aa..478d2b104 100644
--- a/lib/command/sfCommandArgumentsException.class.php
+++ b/lib/command/sfCommandArgumentsException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfCommandArgumentsException extends sfCommandException
+class sfCommandArgumentsException extends \sfCommandException
 {
 }
diff --git a/lib/command/sfCommandException.class.php b/lib/command/sfCommandException.class.php
index 5b7627482..1c61d72b3 100644
--- a/lib/command/sfCommandException.class.php
+++ b/lib/command/sfCommandException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfCommandException extends sfException
+class sfCommandException extends \sfException
 {
 }
diff --git a/lib/command/sfCommandLogger.class.php b/lib/command/sfCommandLogger.class.php
index b81347180..d52afe40d 100644
--- a/lib/command/sfCommandLogger.class.php
+++ b/lib/command/sfCommandLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,17 +14,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfCommandLogger extends sfConsoleLogger
+class sfCommandLogger extends \sfConsoleLogger
 {
     /**
      * Initializes this logger.
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
-        $dispatcher->connect('command.log', array($this, 'listenToLogEvent'));
+        $dispatcher->connect('command.log', [$this, 'listenToLogEvent']);
 
         return parent::initialize($dispatcher, $options);
     }
@@ -31,9 +32,9 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
     /**
      * Listens to command.log events.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
-    public function listenToLogEvent(sfEvent $event)
+    public function listenToLogEvent(\sfEvent $event)
     {
         $priority = isset($event['priority']) ? $event['priority'] : self::INFO;
 
diff --git a/lib/command/sfCommandManager.class.php b/lib/command/sfCommandManager.class.php
index 7d148ada3..95eb4a54c 100644
--- a/lib/command/sfCommandManager.class.php
+++ b/lib/command/sfCommandManager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,38 +22,38 @@ class sfCommandManager
     protected $arguments = '';
 
     /** @var string[] */
-    protected $errors = array();
+    protected $errors = [];
 
-    /** @var sfCommandOptionSet */
+    /** @var \sfCommandOptionSet */
     protected $optionSet;
 
-    /** @var sfCommandArgumentSet */
-    protected $argumentSet = array();
+    /** @var \sfCommandArgumentSet */
+    protected $argumentSet = [];
 
     /** @var array */
-    protected $optionValues = array();
+    protected $optionValues = [];
 
     /** @var array */
-    protected $argumentValues = array();
+    protected $argumentValues = [];
 
     /** @var array */
-    protected $parsedArgumentValues = array();
+    protected $parsedArgumentValues = [];
 
     /**
      * Constructor.
      *
-     * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
-     * @param sfCommandOptionSet   $optionSet   A setOptionSet object
+     * @param \sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
+     * @param \sfCommandOptionSet   $optionSet   A setOptionSet object
      */
-    public function __construct(sfCommandArgumentSet $argumentSet = null, sfCommandOptionSet $optionSet = null)
+    public function __construct(\sfCommandArgumentSet $argumentSet = null, \sfCommandOptionSet $optionSet = null)
     {
         if (null === $argumentSet) {
-            $argumentSet = new sfCommandArgumentSet();
+            $argumentSet = new \sfCommandArgumentSet();
         }
         $this->setArgumentSet($argumentSet);
 
         if (null === $optionSet) {
-            $optionSet = new sfCommandOptionSet();
+            $optionSet = new \sfCommandOptionSet();
         }
         $this->setOptionSet($optionSet);
     }
@@ -60,9 +61,9 @@ public function __construct(sfCommandArgumentSet $argumentSet = null, sfCommandO
     /**
      * Sets the argument set.
      *
-     * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
+     * @param \sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
      */
-    public function setArgumentSet(sfCommandArgumentSet $argumentSet)
+    public function setArgumentSet(\sfCommandArgumentSet $argumentSet)
     {
         $this->argumentSet = $argumentSet;
     }
@@ -70,7 +71,7 @@ public function setArgumentSet(sfCommandArgumentSet $argumentSet)
     /**
      * Gets the argument set.
      *
-     * @return sfCommandArgumentSet A sfCommandArgumentSet object
+     * @return \sfCommandArgumentSet A sfCommandArgumentSet object
      */
     public function getArgumentSet()
     {
@@ -80,9 +81,9 @@ public function getArgumentSet()
     /**
      * Sets the option set.
      *
-     * @param sfCommandOptionSet $optionSet A sfCommandOptionSet object
+     * @param \sfCommandOptionSet $optionSet A sfCommandOptionSet object
      */
-    public function setOptionSet(sfCommandOptionSet $optionSet)
+    public function setOptionSet(\sfCommandOptionSet $optionSet)
     {
         $this->optionSet = $optionSet;
     }
@@ -90,7 +91,7 @@ public function setOptionSet(sfCommandOptionSet $optionSet)
     /**
      * Gets the option set.
      *
-     * @return sfCommandOptionSet A sfCommandOptionSet object
+     * @return \sfCommandOptionSet A sfCommandOptionSet object
      */
     public function getOptionSet()
     {
@@ -123,10 +124,10 @@ public function process($arguments = null)
         $this->arguments = $arguments;
         $this->optionValues = $this->optionSet->getDefaults();
         $this->argumentValues = $this->argumentSet->getDefaults();
-        $this->parsedArgumentValues = array();
-        $this->errors = array();
+        $this->parsedArgumentValues = [];
+        $this->errors = [];
 
-        while (!in_array($argument = array_shift($this->arguments), array('', null))) {
+        while (!in_array($argument = array_shift($this->arguments), ['', null])) {
             if ('--' == $argument) {
                 // stop options parsing
                 $this->parsedArgumentValues = array_merge($this->parsedArgumentValues, $this->arguments);
@@ -203,12 +204,12 @@ public function getArgumentValues()
      *
      * @return mixed The argument value
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function getArgumentValue($name)
     {
         if (!$this->argumentSet->hasArgument($name)) {
-            throw new sfCommandException(sprintf('The "%s" argument does not exist.', $name));
+            throw new \sfCommandException(sprintf('The "%s" argument does not exist.', $name));
         }
 
         return $this->argumentValues[$name];
@@ -231,18 +232,18 @@ public function getOptionValues()
      *
      * @return mixed The option value
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function getOptionValue($name)
     {
         if (!$this->optionSet->hasOption($name)) {
-            throw new sfCommandException(sprintf('The "%s" option does not exist.', $name));
+            throw new \sfCommandException(sprintf('The "%s" option does not exist.', $name));
         }
 
         return $this->optionValues[$name];
     }
 
-    public function setOption(sfCommandOption $option, $value)
+    public function setOption(\sfCommandOption $option, $value)
     {
         if ($option->isArray()) {
             $this->optionValues[$option->getName()][] = $value;
@@ -318,7 +319,7 @@ protected function parseShortOption($argument)
      */
     protected function parseLongOption($argument)
     {
-        if (false !== strpos($argument, '=')) {
+        if (str_contains($argument, '=')) {
             list($name, $value) = explode('=', $argument, 2);
 
             if (!$this->optionSet->hasOption($name)) {
diff --git a/lib/command/sfCommandOption.class.php b/lib/command/sfCommandOption.class.php
index 43e1f91d3..d2994bb4d 100644
--- a/lib/command/sfCommandOption.class.php
+++ b/lib/command/sfCommandOption.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -38,7 +39,7 @@ class sfCommandOption
      * @param string $help     A help text
      * @param mixed  $default  The default value (must be null for self::PARAMETER_REQUIRED or self::PARAMETER_NONE)
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function __construct($name, $shortcut = null, $mode = null, $help = '', $default = null)
     {
@@ -59,7 +60,7 @@ public function __construct($name, $shortcut = null, $mode = null, $help = '', $
         if (null === $mode) {
             $mode = self::PARAMETER_NONE;
         } elseif (is_string($mode) || $mode > 15) {
-            throw new sfCommandException(sprintf('Option mode "%s" is not valid.', $mode));
+            throw new \sfCommandException(sprintf('Option mode "%s" is not valid.', $mode));
         }
 
         $this->name = $name;
@@ -135,19 +136,19 @@ public function isArray()
      *
      * @param mixed $default The default value
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function setDefault($default = null)
     {
         if (self::PARAMETER_NONE === (self::PARAMETER_NONE & $this->mode) && null !== $default) {
-            throw new sfCommandException('Cannot set a default value when using sfCommandOption::PARAMETER_NONE mode.');
+            throw new \sfCommandException('Cannot set a default value when using sfCommandOption::PARAMETER_NONE mode.');
         }
 
         if ($this->isArray()) {
             if (null === $default) {
-                $default = array();
+                $default = [];
             } elseif (!is_array($default)) {
-                throw new sfCommandException('A default value for an array option must be an array.');
+                throw new \sfCommandException('A default value for an array option must be an array.');
             }
         }
 
diff --git a/lib/command/sfCommandOptionSet.class.php b/lib/command/sfCommandOptionSet.class.php
index 49792f5db..88bef7f1f 100644
--- a/lib/command/sfCommandOptionSet.class.php
+++ b/lib/command/sfCommandOptionSet.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,15 +18,15 @@
  */
 class sfCommandOptionSet
 {
-    protected $options = array();
-    protected $shortcuts = array();
+    protected $options = [];
+    protected $shortcuts = [];
 
     /**
      * Constructor.
      *
      * @param array $options An array of sfCommandOption objects
      */
-    public function __construct($options = array())
+    public function __construct($options = [])
     {
         $this->setOptions($options);
     }
@@ -35,10 +36,10 @@ public function __construct($options = array())
      *
      * @param array $options An array of sfCommandOption objects
      */
-    public function setOptions($options = array())
+    public function setOptions($options = [])
     {
-        $this->options = array();
-        $this->shortcuts = array();
+        $this->options = [];
+        $this->shortcuts = [];
         $this->addOptions($options);
     }
 
@@ -47,7 +48,7 @@ public function setOptions($options = array())
      *
      * @param array $options An array of sfCommandOption objects
      */
-    public function addOptions($options = array())
+    public function addOptions($options = [])
     {
         foreach ($options as $option) {
             $this->addOption($option);
@@ -57,17 +58,17 @@ public function addOptions($options = array())
     /**
      * Add a sfCommandOption objects.
      *
-     * @param sfCommandOption $option A sfCommandOption object
+     * @param \sfCommandOption $option A sfCommandOption object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
-    public function addOption(sfCommandOption $option)
+    public function addOption(\sfCommandOption $option)
     {
         if (isset($this->options[$option->getName()])) {
-            throw new sfCommandException(sprintf('An option named "%s" already exist.', $option->getName()));
+            throw new \sfCommandException(sprintf('An option named "%s" already exist.', $option->getName()));
         }
         if (isset($this->shortcuts[$option->getShortcut()])) {
-            throw new sfCommandException(sprintf('An option with shortcut "%s" already exist.', $option->getShortcut()));
+            throw new \sfCommandException(sprintf('An option with shortcut "%s" already exist.', $option->getShortcut()));
         }
 
         $this->options[$option->getName()] = $option;
@@ -81,14 +82,14 @@ public function addOption(sfCommandOption $option)
      *
      * @param string $name The option name
      *
-     * @return sfCommandOption A sfCommandOption object
+     * @return \sfCommandOption A sfCommandOption object
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     public function getOption($name)
     {
         if (!$this->hasOption($name)) {
-            throw new sfCommandException(sprintf('The "--%s" option does not exist.', $name));
+            throw new \sfCommandException(sprintf('The "--%s" option does not exist.', $name));
         }
 
         return $this->options[$name];
@@ -133,7 +134,7 @@ public function hasShortcut($name)
      *
      * @param string $shortcut
      *
-     * @return sfCommandOption A sfCommandOption object
+     * @return \sfCommandOption A sfCommandOption object
      */
     public function getOptionForShortcut($shortcut)
     {
@@ -147,7 +148,7 @@ public function getOptionForShortcut($shortcut)
      */
     public function getDefaults()
     {
-        $values = array();
+        $values = [];
         foreach ($this->options as $option) {
             $values[$option->getName()] = $option->getDefault();
         }
@@ -162,12 +163,12 @@ public function getDefaults()
      *
      * @return string The option name
      *
-     * @throws sfCommandException
+     * @throws \sfCommandException
      */
     protected function shortcutToName($shortcut)
     {
         if (!isset($this->shortcuts[$shortcut])) {
-            throw new sfCommandException(sprintf('The "-%s" option does not exist.', $shortcut));
+            throw new \sfCommandException(sprintf('The "-%s" option does not exist.', $shortcut));
         }
 
         return $this->shortcuts[$shortcut];
diff --git a/lib/command/sfFormatter.class.php b/lib/command/sfFormatter.class.php
index c5b776ff0..1b2456705 100644
--- a/lib/command/sfFormatter.class.php
+++ b/lib/command/sfFormatter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -39,7 +40,7 @@ public function __construct($maxLineSize = null)
      * @param string $name    The style name
      * @param array  $options An array of options
      */
-    public function setStyle($name, $options = array())
+    public function setStyle($name, $options = [])
     {
     }
 
@@ -51,7 +52,7 @@ public function setStyle($name, $options = array())
      *
      * @return string The formatted text
      */
-    public function format($text = '', $parameters = array())
+    public function format($text = '', $parameters = [])
     {
         return $text;
     }
diff --git a/lib/command/sfSymfonyCommandApplication.class.php b/lib/command/sfSymfonyCommandApplication.class.php
index 11caf20f8..282f23e32 100644
--- a/lib/command/sfSymfonyCommandApplication.class.php
+++ b/lib/command/sfSymfonyCommandApplication.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfSymfonyCommandApplication extends sfCommandApplication
+class sfSymfonyCommandApplication extends \sfCommandApplication
 {
-    protected $taskFiles = array();
+    protected $taskFiles = [];
 
     /**
      * Configures the current symfony command application.
@@ -25,15 +26,15 @@ class sfSymfonyCommandApplication extends sfCommandApplication
     public function configure()
     {
         if (!isset($this->options['symfony_lib_dir'])) {
-            throw new sfInitializationException('You must pass a "symfony_lib_dir" option.');
+            throw new \sfInitializationException('You must pass a "symfony_lib_dir" option.');
         }
 
         $configurationFile = getcwd().'/config/ProjectConfiguration.class.php';
         if (is_readable($configurationFile)) {
             require_once $configurationFile;
-            $configuration = new ProjectConfiguration(getcwd(), $this->dispatcher);
+            $configuration = new \ProjectConfiguration(getcwd(), $this->dispatcher);
         } else {
-            $configuration = new sfProjectConfiguration(getcwd(), $this->dispatcher);
+            $configuration = new \sfProjectConfiguration(getcwd(), $this->dispatcher);
         }
 
         // application
@@ -62,7 +63,7 @@ public function run($options = null)
 
         $this->currentTask = $this->getTaskToExecute($arguments['task']);
 
-        if ($this->currentTask instanceof sfCommandApplicationTask) {
+        if ($this->currentTask instanceof \sfCommandApplicationTask) {
             $this->currentTask->setCommandApplication($this);
         }
 
@@ -78,12 +79,12 @@ public function run($options = null)
      *
      * Looks for tasks in the symfony core, the current project and all project plugins.
      *
-     * @param sfProjectConfiguration $configuration The project configuration
+     * @param \sfProjectConfiguration $configuration The project configuration
      */
-    public function loadTasks(sfProjectConfiguration $configuration)
+    public function loadTasks(\sfProjectConfiguration $configuration)
     {
         // Symfony core tasks
-        $dirs = array(sfConfig::get('sf_symfony_lib_dir').'/task');
+        $dirs = [\sfConfig::get('sf_symfony_lib_dir').'/task'];
 
         // Plugin tasks
         foreach ($configuration->getPluginPaths() as $path) {
@@ -93,15 +94,15 @@ public function loadTasks(sfProjectConfiguration $configuration)
         }
 
         // project tasks
-        $dirs[] = sfConfig::get('sf_lib_dir').'/task';
+        $dirs[] = \sfConfig::get('sf_lib_dir').'/task';
 
-        $finder = sfFinder::type('file')->name('*Task.class.php');
+        $finder = \sfFinder::type('file')->name('*Task.class.php');
         foreach ($finder->in($dirs) as $file) {
             $this->taskFiles[basename($file, '.class.php')] = $file;
         }
 
         // register local autoloader for tasks
-        spl_autoload_register(array($this, 'autoloadTask'));
+        spl_autoload_register([$this, 'autoloadTask']);
 
         // require tasks
         foreach ($this->taskFiles as $task => $file) {
@@ -110,7 +111,7 @@ class_exists($task, true);
         }
 
         // unregister local autoloader
-        spl_autoload_unregister(array($this, 'autoloadTask'));
+        spl_autoload_unregister([$this, 'autoloadTask']);
     }
 
     /**
@@ -132,10 +133,10 @@ public function autoloadTask($class)
     }
 
     /**
-     * @see sfCommandApplication
+     * @see \sfCommandApplication
      */
     public function getLongVersion()
     {
-        return sprintf('%s version %s (%s)', $this->getName(), $this->formatter->format($this->getVersion(), 'INFO'), sfConfig::get('sf_symfony_lib_dir'))."\n";
+        return sprintf('%s version %s (%s)', $this->getName(), $this->formatter->format($this->getVersion(), 'INFO'), \sfConfig::get('sf_symfony_lib_dir'))."\n";
     }
 }
diff --git a/lib/config/sfApplicationConfiguration.class.php b/lib/config/sfApplicationConfiguration.class.php
index d38b03b74..9f621142d 100644
--- a/lib/config/sfApplicationConfiguration.class.php
+++ b/lib/config/sfApplicationConfiguration.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,27 +16,27 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfApplicationConfiguration extends ProjectConfiguration
+abstract class sfApplicationConfiguration extends \ProjectConfiguration
 {
     protected static $coreLoaded = false;
-    protected static $loadedHelpers = array();
+    protected static $loadedHelpers = [];
 
     protected $configCache;
     protected $application;
     protected $environment;
     protected $debug = false;
-    protected $config = array();
+    protected $config = [];
     protected $cache;
 
     /**
      * Constructor.
      *
-     * @param string            $environment The environment name
-     * @param bool              $debug       true to enable debug mode
-     * @param string            $rootDir     The project root directory
-     * @param sfEventDispatcher $dispatcher  An event dispatcher
+     * @param string             $environment The environment name
+     * @param bool               $debug       true to enable debug mode
+     * @param string             $rootDir     The project root directory
+     * @param \sfEventDispatcher $dispatcher  An event dispatcher
      */
-    public function __construct($environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
+    public function __construct($environment, $debug, $rootDir = null, \sfEventDispatcher $dispatcher = null)
     {
         $this->environment = $environment;
         $this->debug = (bool) $debug;
@@ -47,18 +48,18 @@ public function __construct($environment, $debug, $rootDir = null, sfEventDispat
 
         $this->initConfiguration();
 
-        if (sfConfig::get('sf_check_lock')) {
+        if (\sfConfig::get('sf_check_lock')) {
             $this->checkLock();
         }
 
-        if (is_file($file = sfConfig::get('sf_app_cache_dir').'/config/configuration.php')) {
+        if (is_file($file = \sfConfig::get('sf_app_cache_dir').'/config/configuration.php')) {
             $this->cache = require $file;
         }
 
         $this->initialize();
 
         // store current sfConfig values
-        $this->config = sfConfig::getAll();
+        $this->config = \sfConfig::getAll();
     }
 
     /**
@@ -81,8 +82,8 @@ public function initialize()
 
     public function activate()
     {
-        sfConfig::clear();
-        sfConfig::add($this->config);
+        \sfConfig::clear();
+        \sfConfig::add($this->config);
     }
 
     /**
@@ -93,20 +94,20 @@ public function initConfiguration()
         $configCache = $this->getConfigCache();
 
         // in debug mode, start global timer
-        if ($this->isDebug() && !sfConfig::get('sf_cli') && !sfWebDebugPanelTimer::isStarted()) {
-            sfWebDebugPanelTimer::startTime();
+        if ($this->isDebug() && !\sfConfig::get('sf_cli') && !\sfWebDebugPanelTimer::isStarted()) {
+            \sfWebDebugPanelTimer::startTime();
         }
 
         // required core classes for the framework
-        if (!$this->isDebug() && !sfConfig::get('sf_test') && !sfConfig::get('sf_cli') && !self::$coreLoaded) {
+        if (!$this->isDebug() && !\sfConfig::get('sf_test') && !\sfConfig::get('sf_cli') && !self::$coreLoaded) {
             $configCache->import('config/core_compile.yml', false);
         }
 
         // autoloader(s)
-        $this->dispatcher->connect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
-        sfAutoload::getInstance()->register();
+        $this->dispatcher->connect('autoload.filter_config', [$this, 'filterAutoloadConfig']);
+        \sfAutoload::getInstance()->register();
         if ($this->isDebug()) {
-            sfAutoloadAgain::getInstance()->register();
+            \sfAutoloadAgain::getInstance()->register();
         }
 
         // load base settings
@@ -115,29 +116,29 @@ public function initConfiguration()
             include $file;
         }
 
-        if (!sfConfig::get('sf_cli') && false !== sfConfig::get('sf_csrf_secret')) {
-            sfForm::enableCSRFProtection(sfConfig::get('sf_csrf_secret'));
+        if (!\sfConfig::get('sf_cli') && false !== \sfConfig::get('sf_csrf_secret')) {
+            \sfForm::enableCSRFProtection(\sfConfig::get('sf_csrf_secret'));
         }
 
-        sfWidget::setCharset(sfConfig::get('sf_charset'));
-        sfValidatorBase::setCharset(sfConfig::get('sf_charset'));
+        \sfWidget::setCharset(\sfConfig::get('sf_charset'));
+        \sfValidatorBase::setCharset(\sfConfig::get('sf_charset'));
 
         // force setting default timezone if not set
-        if ($default_timezone = sfConfig::get('sf_default_timezone')) {
+        if ($default_timezone = \sfConfig::get('sf_default_timezone')) {
             date_default_timezone_set($default_timezone);
-        } elseif (sfConfig::get('sf_force_default_timezone', true)) {
+        } elseif (\sfConfig::get('sf_force_default_timezone', true)) {
             date_default_timezone_set(@date_default_timezone_get());
         }
 
         // error settings
         ini_set('display_errors', $this->isDebug() ? 'on' : 'off');
-        error_reporting(sfConfig::get('sf_error_reporting'));
+        error_reporting(\sfConfig::get('sf_error_reporting'));
 
         // initialize plugin configuration objects
         $this->initializePlugins();
 
         // compress output
-        if (!self::$coreLoaded && sfConfig::get('sf_compressed')) {
+        if (!self::$coreLoaded && \sfConfig::get('sf_compressed')) {
             ob_start('ob_gzhandler');
         }
 
@@ -149,7 +150,7 @@ public function initConfiguration()
      *
      * @return array
      */
-    public function filterAutoloadConfig(sfEvent $event, array $config)
+    public function filterAutoloadConfig(\sfEvent $event, array $config)
     {
         foreach ($this->pluginConfigurations as $name => $configuration) {
             $config = $configuration->filterAutoloadConfig($event, $config);
@@ -161,12 +162,12 @@ public function filterAutoloadConfig(sfEvent $event, array $config)
     /**
      * Returns a configuration cache object for the current configuration.
      *
-     * @return sfConfigCache A sfConfigCache instance
+     * @return \sfConfigCache A sfConfigCache instance
      */
     public function getConfigCache()
     {
         if (null === $this->configCache) {
-            $this->configCache = new sfConfigCache($this);
+            $this->configCache = new \sfConfigCache($this);
         }
 
         return $this->configCache;
@@ -178,16 +179,16 @@ public function getConfigCache()
     public function checkLock()
     {
         if (
-            $this->hasLockFile(sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.$this->getApplication().'_'.$this->getEnvironment().'-cli.lck', 5)
-            || $this->hasLockFile(sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.$this->getApplication().'_'.$this->getEnvironment().'.lck')
+            $this->hasLockFile(\sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.$this->getApplication().'_'.$this->getEnvironment().'-cli.lck', 5)
+            || $this->hasLockFile(\sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.$this->getApplication().'_'.$this->getEnvironment().'.lck')
         ) {
             // application is not available - we'll find the most specific unavailable page...
-            $files = array(
-                sfConfig::get('sf_app_config_dir').'/unavailable.php',
-                sfConfig::get('sf_config_dir').'/unavailable.php',
-                sfConfig::get('sf_web_dir').'/errors/unavailable.php',
+            $files = [
+                \sfConfig::get('sf_app_config_dir').'/unavailable.php',
+                \sfConfig::get('sf_config_dir').'/unavailable.php',
+                \sfConfig::get('sf_web_dir').'/errors/unavailable.php',
                 $this->getSymfonyLibDir().'/exception/data/unavailable.php',
-            );
+            ];
 
             foreach ($files as $file) {
                 if (is_readable($file)) {
@@ -213,14 +214,14 @@ public function setRootDir($rootDir)
     {
         parent::setRootDir($rootDir);
 
-        sfConfig::add(array(
+        \sfConfig::add([
             'sf_app' => $this->getApplication(),
             'sf_environment' => $this->getEnvironment(),
             'sf_debug' => $this->isDebug(),
             'sf_cli' => PHP_SAPI === 'cli',
-        ));
+        ]);
 
-        $this->setAppDir(sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$this->getApplication());
+        $this->setAppDir(\sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$this->getApplication());
     }
 
     /**
@@ -230,7 +231,7 @@ public function setRootDir($rootDir)
      */
     public function setAppDir($appDir)
     {
-        sfConfig::add(array(
+        \sfConfig::add([
             'sf_app_dir' => $appDir,
 
             // SF_APP_DIR directory structure
@@ -239,17 +240,17 @@ public function setAppDir($appDir)
             'sf_app_module_dir' => $appDir.DIRECTORY_SEPARATOR.'modules',
             'sf_app_template_dir' => $appDir.DIRECTORY_SEPARATOR.'templates',
             'sf_app_i18n_dir' => $appDir.DIRECTORY_SEPARATOR.'i18n',
-        ));
+        ]);
     }
 
     /**
-     * @see sfProjectConfiguration
+     * @see \sfProjectConfiguration
      */
     public function setCacheDir($cacheDir)
     {
         parent::setCacheDir($cacheDir);
 
-        sfConfig::add(array(
+        \sfConfig::add([
             'sf_app_base_cache_dir' => $cacheDir.DIRECTORY_SEPARATOR.$this->getApplication(),
             'sf_app_cache_dir' => $appCacheDir = $cacheDir.DIRECTORY_SEPARATOR.$this->getApplication().DIRECTORY_SEPARATOR.$this->getEnvironment(),
 
@@ -259,7 +260,7 @@ public function setCacheDir($cacheDir)
             'sf_config_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'config',
             'sf_test_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'test',
             'sf_module_cache_dir' => $appCacheDir.DIRECTORY_SEPARATOR.'modules',
-        ));
+        ]);
     }
 
     /**
@@ -272,9 +273,9 @@ public function setCacheDir($cacheDir)
     public function getControllerDirs($moduleName)
     {
         if (!isset($this->cache['getControllerDirs'][$moduleName])) {
-            $dirs = array();
+            $dirs = [];
 
-            $dirs[sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/actions'] = false; // application
+            $dirs[\sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/actions'] = false; // application
 
             foreach ($this->getPluginPaths() as $path) {
                 if (is_dir($dir = $path.'/modules/'.$moduleName.'/actions')) {
@@ -301,12 +302,12 @@ public function getControllerDirs($moduleName)
      */
     public function getLibDirs($moduleName)
     {
-        $dirs = array();
+        $dirs = [];
 
-        $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib';                  // application
+        $dirs[] = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib';                  // application
         $dirs = array_merge($dirs, $this->getPluginSubPaths('/modules/'.$moduleName.'/lib')); // plugins
         $dirs[] = $this->getSymfonyLibDir().'/controller/'.$moduleName.'/lib';                // core modules
-        $dirs[] = sfConfig::get('sf_module_cache_dir').'/auto'.ucfirst($moduleName.'/lib');   // generated templates in cache
+        $dirs[] = \sfConfig::get('sf_module_cache_dir').'/auto'.ucfirst($moduleName.'/lib');   // generated templates in cache
 
         return $dirs;
     }
@@ -320,12 +321,12 @@ public function getLibDirs($moduleName)
      */
     public function getTemplateDirs($moduleName)
     {
-        $dirs = array();
+        $dirs = [];
 
-        $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';                  // application
+        $dirs[] = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';                  // application
         $dirs = array_merge($dirs, $this->getPluginSubPaths('/modules/'.$moduleName.'/templates')); // plugins
         $dirs[] = $this->getSymfonyLibDir().'/controller/'.$moduleName.'/templates';                // core modules
-        $dirs[] = sfConfig::get('sf_module_cache_dir').'/auto'.ucfirst($moduleName.'/templates');   // generated templates in cache
+        $dirs[] = \sfConfig::get('sf_module_cache_dir').'/auto'.ucfirst($moduleName.'/templates');   // generated templates in cache
 
         return $dirs;
     }
@@ -339,22 +340,22 @@ public function getTemplateDirs($moduleName)
      */
     public function getHelperDirs($moduleName = '')
     {
-        $dirs = array();
+        $dirs = [];
 
         if ($moduleName) {
-            $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib/helper'; // module
+            $dirs[] = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/lib/helper'; // module
 
             $dirs = array_merge($dirs, $this->getPluginSubPaths('/modules/'.$moduleName.'/lib/helper'));
         }
 
         return array_merge(
             $dirs,
-            array(
-                sfConfig::get('sf_app_lib_dir').'/helper',         // application
-                sfConfig::get('sf_lib_dir').'/helper',             // project
-            ),
+            [
+                \sfConfig::get('sf_app_lib_dir').'/helper',         // application
+                \sfConfig::get('sf_lib_dir').'/helper',             // project
+            ],
             $this->getPluginSubPaths('/lib/helper'),             // plugins
-            array($this->getSymfonyLibDir().'/helper')           // symfony
+            [$this->getSymfonyLibDir().'/helper']           // symfony
         );
     }
 
@@ -398,7 +399,7 @@ public function getTemplatePath($moduleName, $templateFile)
     }
 
     /**
-     * @see sfProjectConfiguration
+     * @see \sfProjectConfiguration
      */
     public function getPluginPaths()
     {
@@ -416,7 +417,7 @@ public function getPluginPaths()
      */
     public function getDecoratorDirs()
     {
-        return array(sfConfig::get('sf_app_template_dir'));
+        return [\sfConfig::get('sf_app_template_dir')];
     }
 
     /**
@@ -442,10 +443,10 @@ public function getDecoratorDir($template)
      */
     public function getI18NGlobalDirs()
     {
-        $dirs = array();
+        $dirs = [];
 
         // application
-        if (is_dir($dir = sfConfig::get('sf_app_i18n_dir'))) {
+        if (is_dir($dir = \sfConfig::get('sf_app_i18n_dir'))) {
             $dirs[] = $dir;
         }
 
@@ -462,15 +463,15 @@ public function getI18NGlobalDirs()
      */
     public function getI18NDirs($moduleName)
     {
-        $dirs = array();
+        $dirs = [];
 
         // module
-        if (is_dir($dir = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/i18n')) {
+        if (is_dir($dir = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/i18n')) {
             $dirs[] = $dir;
         }
 
         // application
-        if (is_dir($dir = sfConfig::get('sf_app_i18n_dir'))) {
+        if (is_dir($dir = \sfConfig::get('sf_app_i18n_dir'))) {
             $dirs[] = $dir;
         }
 
@@ -492,9 +493,9 @@ public function getConfigPaths($configPath)
     {
         $globalConfigPath = basename(dirname($configPath)).'/'.basename($configPath);
 
-        $files = array(
+        $files = [
             $this->getSymfonyLibDir().'/config/'.$globalConfigPath, // symfony
-        );
+        ];
 
         foreach ($this->getPluginPaths() as $path) {
             if (is_file($file = $path.'/'.$globalConfigPath)) {
@@ -502,12 +503,12 @@ public function getConfigPaths($configPath)
             }
         }
 
-        $files = array_merge($files, array(
+        $files = array_merge($files, [
             $this->getRootDir().'/'.$globalConfigPath,              // project
             $this->getRootDir().'/'.$configPath,                    // project
-            sfConfig::get('sf_app_dir').'/'.$globalConfigPath,      // application
-            sfConfig::get('sf_app_cache_dir').'/'.$configPath,      // generated modules
-        ));
+            \sfConfig::get('sf_app_dir').'/'.$globalConfigPath,      // application
+            \sfConfig::get('sf_app_cache_dir').'/'.$configPath,      // generated modules
+        ]);
 
         foreach ($this->getPluginPaths() as $path) {
             if (is_file($file = $path.'/'.$configPath)) {
@@ -515,9 +516,9 @@ public function getConfigPaths($configPath)
             }
         }
 
-        $files[] = sfConfig::get('sf_app_dir').'/'.$configPath;   // module
+        $files[] = \sfConfig::get('sf_app_dir').'/'.$configPath;   // module
 
-        $configs = array();
+        $configs = [];
         foreach (array_unique($files) as $file) {
             if (is_readable($file)) {
                 $configs[] = $file;
@@ -562,7 +563,7 @@ public function loadHelpers($helpers, $moduleName = '')
                 }
 
                 if (!$included) {
-                    throw new InvalidArgumentException(sprintf('Unable to load "%sHelper.php" helper in: %s.', $helperName, implode(', ', array_map(array('sfDebug', 'shortenFilePath'), $dirs))));
+                    throw new \InvalidArgumentException(sprintf('Unable to load "%sHelper.php" helper in: %s.', $helperName, implode(', ', array_map(['sfDebug', 'shortenFilePath'], $dirs))));
                 }
             }
 
diff --git a/lib/config/sfAutoloadConfigHandler.class.php b/lib/config/sfAutoloadConfigHandler.class.php
index 09faea48e..4aec4d0d2 100755
--- a/lib/config/sfAutoloadConfigHandler.class.php
+++ b/lib/config/sfAutoloadConfigHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +15,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfAutoloadConfigHandler extends sfYamlConfigHandler
+class sfAutoloadConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -24,15 +24,15 @@ class sfAutoloadConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
         // set our required categories list and initialize our handler
-        $this->initialize(array('required_categories' => array('autoload')));
+        $this->initialize(['required_categories' => ['autoload']]);
 
-        $data = array();
+        $data = [];
         foreach ($this->parse($configFiles) as $name => $mapping) {
             $data[] = sprintf("\n  // %s", $name);
 
@@ -53,7 +53,7 @@ public function execute($configFiles)
 
     public function evaluate($configFiles)
     {
-        $mappings = array();
+        $mappings = [];
         foreach ($this->parse($configFiles) as $mapping) {
             foreach ($mapping as $class => $file) {
                 $mappings[$class] = $file;
@@ -65,7 +65,7 @@ public function evaluate($configFiles)
 
     public static function parseFile($path, $file, $prefix)
     {
-        $mapping = array();
+        $mapping = [];
         preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
         foreach ($classes[1] as $class) {
             $localPrefix = '';
@@ -84,14 +84,14 @@ public static function parseFile($path, $file, $prefix)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
-        $configuration = sfProjectConfiguration::getActive();
+        $configuration = \sfProjectConfiguration::getActive();
 
         $pluginPaths = $configuration->getPluginPaths();
-        $pluginConfigFiles = array();
+        $pluginConfigFiles = [];
 
         // move plugin files to front
         foreach ($configFiles as $i => $configFile) {
@@ -113,7 +113,7 @@ public static function getConfiguration(array $configFiles)
             }
         }
 
-        $event = $configuration->getEventDispatcher()->filter(new sfEvent(__CLASS__, 'autoload.filter_config'), $config);
+        $event = $configuration->getEventDispatcher()->filter(new \sfEvent(__CLASS__, 'autoload.filter_config'), $config);
         $config = $event->getReturnValue();
 
         return $config;
@@ -124,9 +124,9 @@ protected function parse(array $configFiles)
         // parse the yaml
         $config = static::getConfiguration($configFiles);
 
-        $mappings = array();
+        $mappings = [];
         foreach ($config['autoload'] as $name => $entry) {
-            $mapping = array();
+            $mapping = [];
 
             // file mapping or directory mapping?
             if (isset($entry['files'])) {
@@ -140,8 +140,8 @@ protected function parse(array $configFiles)
                 $path = $entry['path'];
 
                 // we automatically add our php classes
-                require_once sfConfig::get('sf_symfony_lib_dir').'/util/sfFinder.class.php';
-                $finder = sfFinder::type('file')->name('*'.$ext)->follow_link();
+                require_once \sfConfig::get('sf_symfony_lib_dir').'/util/sfFinder.class.php';
+                $finder = \sfFinder::type('file')->name('*'.$ext)->follow_link();
 
                 // recursive mapping?
                 $recursive = isset($entry['recursive']) ? $entry['recursive'] : false;
diff --git a/lib/config/sfCacheConfigHandler.class.php b/lib/config/sfCacheConfigHandler.class.php
index bc4095df0..1f687b096 100644
--- a/lib/config/sfCacheConfigHandler.class.php
+++ b/lib/config/sfCacheConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfCacheConfigHandler extends sfYamlConfigHandler
+class sfCacheConfigHandler extends \sfYamlConfigHandler
 {
-    protected $cacheConfig = array();
+    protected $cacheConfig = [];
 
     /**
      * Executes this configuration handler.
@@ -26,9 +27,9 @@ class sfCacheConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException  If a requested configuration file does not exist or is not readable
-     * @throws sfParseException          If a requested configuration file is improperly formatted
-     * @throws sfInitializationException If a cache.yml key check fails
+     * @throws \sfConfigurationException  If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException          If a requested configuration file is improperly formatted
+     * @throws \sfInitializationException If a cache.yml key check fails
      */
     public function execute($configFiles)
     {
@@ -36,7 +37,7 @@ public function execute($configFiles)
         $this->yamlConfig = static::getConfiguration($configFiles);
 
         // iterate through all action names
-        $data = array();
+        $data = [];
         $first = true;
         foreach ($this->yamlConfig as $actionName => $values) {
             if ('all' == $actionName) {
@@ -64,7 +65,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
@@ -80,7 +81,7 @@ public static function getConfiguration(array $configFiles)
      */
     protected function addCache($actionName = '')
     {
-        $data = array();
+        $data = [];
 
         // enabled?
         $enabled = $this->getConfigValue('enabled', $actionName);
@@ -98,9 +99,9 @@ protected function addCache($actionName = '')
         $contextual = $this->getConfigValue('contextual', $actionName) ? 'true' : 'false';
 
         // vary
-        $vary = $this->getConfigValue('vary', $actionName, array());
+        $vary = $this->getConfigValue('vary', $actionName, []);
         if (!is_array($vary)) {
-            $vary = array($vary);
+            $vary = [$vary];
         }
 
         // add cache information to cache manager
diff --git a/lib/config/sfCompileConfigHandler.class.php b/lib/config/sfCompileConfigHandler.class.php
index 70f29f2be..c217ac5f0 100644
--- a/lib/config/sfCompileConfigHandler.class.php
+++ b/lib/config/sfCompileConfigHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfCompileConfigHandler extends sfYamlConfigHandler
+class sfCompileConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -27,8 +27,8 @@ class sfCompileConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
@@ -42,24 +42,24 @@ public function execute($configFiles)
         foreach ($config as $file) {
             if (!is_readable($file)) {
                 // file doesn't exist
-                throw new sfParseException(sprintf('Configuration file "%s" specifies nonexistent or unreadable file "%s".', $configFiles[0], $file));
+                throw new \sfParseException(sprintf('Configuration file "%s" specifies nonexistent or unreadable file "%s".', $configFiles[0], $file));
             }
 
             $contents = file_get_contents($file);
 
             // strip comments (not in debug mode)
-            if (!sfConfig::get('sf_debug')) {
-                $contents = sfToolkit::stripComments($contents);
+            if (!\sfConfig::get('sf_debug')) {
+                $contents = \sfToolkit::stripComments($contents);
             }
 
             // strip php tags
-            $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php\s*)?/m' => '', '/^\s*\?>/m' => ''));
+            $contents = \sfToolkit::pregtr($contents, ['/^\s*<\?(php\s*)?/m' => '', '/^\s*\?>/m' => '']);
 
             // replace windows and mac format with unix format
             $contents = str_replace("\r", "\n", $contents);
 
             // replace multiple new lines with a single newline
-            $contents = preg_replace(array('/\s+$/Sm', '/\n+/S'), "\n", $contents);
+            $contents = preg_replace(['/\s+$/Sm', '/\n+/S'], "\n", $contents);
 
             // append file data
             $data .= "\n".$contents;
@@ -77,11 +77,11 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
-        $config = array();
+        $config = [];
         foreach ($configFiles as $configFile) {
             $config = array_merge($config, static::parseYaml($configFile));
         }
diff --git a/lib/config/sfConfig.class.php b/lib/config/sfConfig.class.php
index 7be4530bd..193996e0c 100644
--- a/lib/config/sfConfig.class.php
+++ b/lib/config/sfConfig.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  */
 class sfConfig
 {
-    protected static $config = array();
+    protected static $config = [];
 
     /**
      * Retrieves a config parameter.
@@ -65,7 +66,7 @@ public static function set($name, $value)
      *
      * @param array $parameters An associative array of config parameters and their associated values
      */
-    public static function add($parameters = array())
+    public static function add($parameters = [])
     {
         self::$config = array_merge(self::$config, $parameters);
     }
@@ -85,6 +86,6 @@ public static function getAll()
      */
     public static function clear()
     {
-        self::$config = array();
+        self::$config = [];
     }
 }
diff --git a/lib/config/sfConfigCache.class.php b/lib/config/sfConfigCache.class.php
index bf33328a4..f99972e94 100644
--- a/lib/config/sfConfigCache.class.php
+++ b/lib/config/sfConfigCache.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,15 +22,15 @@
 class sfConfigCache
 {
     protected $configuration;
-    protected $handlers = array();
-    protected $userHandlers = array();
+    protected $handlers = [];
+    protected $userHandlers = [];
 
     /**
      * Constructor.
      *
-     * @param sfApplicationConfiguration $configuration A sfApplicationConfiguration instance
+     * @param \sfApplicationConfiguration $configuration A sfApplicationConfiguration instance
      */
-    public function __construct(sfApplicationConfiguration $configuration)
+    public function __construct(\sfApplicationConfiguration $configuration)
     {
         $this->configuration = $configuration;
     }
@@ -49,27 +49,27 @@ public function __construct(sfApplicationConfiguration $configuration)
      *
      * @return string An absolute filesystem path to the cache filename associated with this specified configuration file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist
+     * @throws \sfConfigurationException If a requested configuration file does not exist
      *
      * @see sfConfiguration::getConfigPaths()
      */
     public function checkConfig($configPath, $optional = false)
     {
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
-            $timer = sfTimerManager::getTimer('Configuration');
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
+            $timer = \sfTimerManager::getTimer('Configuration');
         }
 
         // the cache filename we'll be using
         $cache = $this->getCacheName($configPath);
 
-        if (!sfConfig::get('sf_debug') && !sfConfig::get('sf_test') && is_readable($cache)) {
+        if (!\sfConfig::get('sf_debug') && !\sfConfig::get('sf_test') && is_readable($cache)) {
             return $cache;
         }
 
-        if (!sfToolkit::isPathAbsolute($configPath)) {
+        if (!\sfToolkit::isPathAbsolute($configPath)) {
             $files = $this->configuration->getConfigPaths($configPath);
         } else {
-            $files = is_readable($configPath) ? array($configPath) : array();
+            $files = is_readable($configPath) ? [$configPath] : [];
         }
 
         if (!isset($files[0])) {
@@ -78,7 +78,7 @@ public function checkConfig($configPath, $optional = false)
             }
 
             // configuration does not exist
-            throw new sfConfigurationException(sprintf('Configuration "%s" does not exist or is unreadable.', $configPath));
+            throw new \sfConfigurationException(sprintf('Configuration "%s" does not exist or is unreadable.', $configPath));
         }
 
         // find the more recent configuration file last modification time
@@ -94,7 +94,7 @@ public function checkConfig($configPath, $optional = false)
             $this->callHandler($configPath, $files, $cache);
         }
 
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
             // @var $timer sfTimer
             $timer->addTime();
         }
@@ -107,7 +107,7 @@ public function checkConfig($configPath, $optional = false)
      */
     public function clear()
     {
-        sfToolkit::clearDirectory(sfConfig::get('sf_config_cache_dir'));
+        \sfToolkit::clearDirectory(\sfConfig::get('sf_config_cache_dir'));
     }
 
     /**
@@ -125,10 +125,10 @@ public function getCacheName($config)
         }
 
         // replace unfriendly filename characters with an underscore
-        $config = str_replace(array('\\', '/', ' '), '_', $config);
+        $config = str_replace(['\\', '/', ' '], '_', $config);
         $config .= '.php';
 
-        return sfConfig::get('sf_config_cache_dir').'/'.$config;
+        return \sfConfig::get('sf_config_cache_dir').'/'.$config;
     }
 
     /**
@@ -160,10 +160,10 @@ public function import($config, $once = true, $optional = false)
      * Registers a configuration handler.
      *
      * @param string $handler The handler to use when parsing a configuration file
-     * @param class  $class   A configuration handler class
+     * @param \class $class   A configuration handler class
      * @param string $params  An array of options for the handler class initialization
      */
-    public function registerConfigHandler($handler, $class, $params = array())
+    public function registerConfigHandler($handler, $class, $params = [])
     {
         $this->userHandlers[$handler] = new $class($params);
     }
@@ -175,7 +175,7 @@ public function registerConfigHandler($handler, $class, $params = array())
      * @param array  $configs An array of absolute filesystem paths to configuration files
      * @param string $cache   An absolute filesystem path to the cache file that will be written
      *
-     * @throws sfConfigurationException If a requested configuration file does not have an associated configuration handler
+     * @throws \sfConfigurationException If a requested configuration file does not have an associated configuration handler
      */
     protected function callHandler($handler, $configs, $cache)
     {
@@ -206,8 +206,8 @@ protected function callHandler($handler, $configs, $cache)
             // let's see if we have any wildcard handlers registered that match this basename
             foreach (array_keys($this->handlers) as $key) {
                 // replace wildcard chars in the configuration
-                $pattern = strtr($key, array('.' => '\.', '*' => '(.*?)'));
-                $matches = array();
+                $pattern = strtr($key, ['.' => '\.', '*' => '(.*?)']);
+                $matches = [];
 
                 // create pattern from config
                 if (preg_match('#'.$pattern.'$#', $handler, $matches)) {
@@ -222,7 +222,7 @@ protected function callHandler($handler, $configs, $cache)
 
         if (!$handlerInstance) {
             // we do not have a registered handler for this file
-            throw new sfConfigurationException(sprintf('Configuration file "%s" does not have a registered handler.', implode(', ', $configs)));
+            throw new \sfConfigurationException(sprintf('Configuration file "%s" does not have a registered handler.', implode(', ', $configs)));
         }
 
         // call the handler and retrieve the cache data
@@ -236,7 +236,7 @@ protected function callHandler($handler, $configs, $cache)
      *
      * @param string $name The config handler name
      *
-     * @return sfConfigHandler A sfConfigHandler instance
+     * @return \sfConfigHandler A sfConfigHandler instance
      */
     protected function getHandler($name)
     {
@@ -251,12 +251,12 @@ protected function getHandler($name)
     /**
      * Loads all configuration application and module level handlers.
      *
-     * @throws sfConfigurationException If a configuration related error occurs
+     * @throws \sfConfigurationException If a configuration related error occurs
      */
     protected function loadConfigHandlers()
     {
         // manually create our config_handlers.yml handler
-        $this->handlers['config_handlers.yml'] = new sfRootConfigHandler();
+        $this->handlers['config_handlers.yml'] = new \sfRootConfigHandler();
 
         // application configuration handlers
 
@@ -265,12 +265,12 @@ protected function loadConfigHandlers()
         // module level configuration handlers
 
         // checks modules directory exists
-        if (!is_readable($sf_app_module_dir = sfConfig::get('sf_app_module_dir'))) {
+        if (!is_readable($sf_app_module_dir = \sfConfig::get('sf_app_module_dir'))) {
             return;
         }
 
         // ignore names
-        $ignore = array('.', '..', 'CVS', '.svn');
+        $ignore = ['.', '..', 'CVS', '.svn'];
 
         // create a file pointer to the module dir
         $fp = opendir($sf_app_module_dir);
@@ -285,7 +285,7 @@ protected function loadConfigHandlers()
 
             if (is_readable($configPath)) {
                 // initialize the root configuration handler with this module name
-                $params = array('module_level' => true, 'module_name' => $directory);
+                $params = ['module_level' => true, 'module_name' => $directory];
 
                 $this->handlers['config_handlers.yml']->initialize($params);
 
@@ -308,7 +308,7 @@ protected function loadConfigHandlers()
      * @param string $cache  An absolute filesystem path to the cache file that will be written
      * @param string $data   Data to be written to the cache file
      *
-     * @throws sfCacheException If the cache file cannot be written
+     * @throws \sfCacheException If the cache file cannot be written
      */
     protected function writeCacheFile($config, $cache, $data)
     {
@@ -321,7 +321,7 @@ protected function writeCacheFile($config, $cache, $data)
         $tmpFile = tempnam($cacheDir, basename($cache));
 
         if (!$fp = @fopen($tmpFile, 'wb')) {
-            throw new sfCacheException(sprintf('Failed to write cache file "%s" generated from configuration file "%s".', $tmpFile, $config));
+            throw new \sfCacheException(sprintf('Failed to write cache file "%s" generated from configuration file "%s".', $tmpFile, $config));
         }
 
         @fwrite($fp, $data);
@@ -349,6 +349,6 @@ protected function mergeUserConfigHandlers()
         // user defined configuration handlers
         $this->handlers = array_merge($this->handlers, $this->userHandlers);
 
-        $this->userHandlers = array();
+        $this->userHandlers = [];
     }
 }
diff --git a/lib/config/sfConfigHandler.class.php b/lib/config/sfConfigHandler.class.php
index 8904862af..7e1ebbbfb 100644
--- a/lib/config/sfConfigHandler.class.php
+++ b/lib/config/sfConfigHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,7 +21,7 @@
  */
 abstract class sfConfigHandler
 {
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $parameterHolder;
 
     /**
@@ -29,7 +29,7 @@ abstract class sfConfigHandler
      *
      * @see initialize()
      *
-     * @param array|null $parameters
+     * @param \array|null $parameters
      */
     public function __construct($parameters = null)
     {
@@ -41,11 +41,11 @@ public function __construct($parameters = null)
      *
      * @param array $parameters An associative array of initialization parameters
      *
-     * @throws sfInitializationException If an error occurs while initializing this ConfigHandler
+     * @throws \sfInitializationException If an error occurs while initializing this ConfigHandler
      */
     public function initialize($parameters = null)
     {
-        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder = new \sfParameterHolder();
         $this->parameterHolder->add($parameters);
     }
 
@@ -56,8 +56,8 @@ public function initialize($parameters = null)
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     abstract public function execute($configFiles);
 
@@ -73,9 +73,9 @@ abstract public function execute($configFiles);
     public static function replaceConstants($value)
     {
         if (is_array($value)) {
-            array_walk_recursive($value, function (&$value) { $value = sfToolkit::replaceConstants($value); });
+            array_walk_recursive($value, function (&$value) { $value = \sfToolkit::replaceConstants($value); });
         } else {
-            $value = sfToolkit::replaceConstants($value);
+            $value = \sfToolkit::replaceConstants($value);
         }
 
         return $value;
@@ -91,11 +91,11 @@ public static function replaceConstants($value)
     public static function replacePath($path)
     {
         if (is_array($path)) {
-            array_walk_recursive($path, function (&$path) { $path = sfConfigHandler::replacePath($path); });
+            array_walk_recursive($path, function (&$path) { $path = \sfConfigHandler::replacePath($path); });
         } else {
-            if (!sfToolkit::isPathAbsolute($path)) {
+            if (!\sfToolkit::isPathAbsolute($path)) {
                 // not an absolute path so we'll prepend to it
-                $path = sfConfig::get('sf_app_dir').'/'.$path;
+                $path = \sfConfig::get('sf_app_dir').'/'.$path;
             }
         }
 
@@ -105,7 +105,7 @@ public static function replacePath($path)
     /**
      * Gets the parameter holder for this configuration handler.
      *
-     * @return sfParameterHolder A sfParameterHolder instance
+     * @return \sfParameterHolder A sfParameterHolder instance
      */
     public function getParameterHolder()
     {
@@ -117,10 +117,10 @@ public function getParameterHolder()
      *
      * @param array $configFiles An array of ordered configuration files
      *
-     * @throws LogicException no matter what
+     * @throws \LogicException no matter what
      */
     public static function getConfiguration(array $configFiles)
     {
-        throw new LogicException('You must call the ::getConfiguration() method on a concrete config handler class');
+        throw new \LogicException('You must call the ::getConfiguration() method on a concrete config handler class');
     }
 }
diff --git a/lib/config/sfDatabaseConfigHandler.class.php b/lib/config/sfDatabaseConfigHandler.class.php
index 8113693f7..8a47add0d 100644
--- a/lib/config/sfDatabaseConfigHandler.class.php
+++ b/lib/config/sfDatabaseConfigHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDatabaseConfigHandler extends sfYamlConfigHandler
+class sfDatabaseConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -28,8 +28,8 @@ class sfDatabaseConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
@@ -62,7 +62,7 @@ public function evaluate($configFiles)
             require_once $include;
         }
 
-        $databases = array();
+        $databases = [];
         foreach ($data as $name => $database) {
             $databases[$name] = new $database[0]($database[1]);
         }
@@ -71,7 +71,7 @@ public function evaluate($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
@@ -92,16 +92,16 @@ protected function parse($configFiles)
         $config = static::getConfiguration($configFiles);
 
         // init our data and includes arrays
-        $data = array();
-        $databases = array();
-        $includes = array();
+        $data = [];
+        $databases = [];
+        $includes = [];
 
         // get a list of database connections
         foreach ($config as $name => $dbConfig) {
             // is this category already registered?
             if (in_array($name, $databases)) {
                 // this category is already registered
-                throw new sfParseException(sprintf('Configuration file "%s" specifies previously registered category "%s".', $configFiles[0], $name));
+                throw new \sfParseException(sprintf('Configuration file "%s" specifies previously registered category "%s".', $configFiles[0], $name));
             }
 
             // add this database
@@ -110,14 +110,14 @@ protected function parse($configFiles)
             // let's do our fancy work
             if (!isset($dbConfig['class'])) {
                 // missing class key
-                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $name));
+                throw new \sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $name));
             }
 
             if (isset($dbConfig['file'])) {
                 // we have a file to include
                 if (!is_readable($dbConfig['file'])) {
                     // database file doesn't exist
-                    throw new sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $dbConfig['class'], $dbConfig['file']));
+                    throw new \sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $dbConfig['class'], $dbConfig['file']));
                 }
 
                 // append our data
@@ -125,16 +125,16 @@ protected function parse($configFiles)
             }
 
             // parse parameters
-            $parameters = array();
+            $parameters = [];
             if (isset($dbConfig['param'])) {
                 $parameters = $dbConfig['param'];
             }
             $parameters['name'] = $name;
 
             // append new data
-            $data[$name] = array($dbConfig['class'], $parameters);
+            $data[$name] = [$dbConfig['class'], $parameters];
         }
 
-        return array($includes, $data);
+        return [$includes, $data];
     }
 }
diff --git a/lib/config/sfDefineEnvironmentConfigHandler.class.php b/lib/config/sfDefineEnvironmentConfigHandler.class.php
index 979817859..7abb60009 100644
--- a/lib/config/sfDefineEnvironmentConfigHandler.class.php
+++ b/lib/config/sfDefineEnvironmentConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDefineEnvironmentConfigHandler extends sfYamlConfigHandler
+class sfDefineEnvironmentConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -22,8 +23,8 @@ class sfDefineEnvironmentConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
@@ -41,7 +42,7 @@ public function execute($configFiles)
         // parse the yaml
         $config = static::getConfiguration($configFiles);
 
-        $values = array();
+        $values = [];
         foreach ($config as $category => $keys) {
             $values = array_merge($values, $this->getValues($prefix, $category, $keys));
         }
@@ -64,7 +65,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
@@ -85,10 +86,10 @@ protected function getValues($prefix, $category, $keys)
         if (!is_array($keys)) {
             list($key, $value) = $this->fixCategoryValue($prefix.strtolower($category), '', $keys);
 
-            return array($key => $value);
+            return [$key => $value];
         }
 
-        $values = array();
+        $values = [];
 
         $category = $this->fixCategoryName($category, $prefix);
 
@@ -112,7 +113,7 @@ protected function getValues($prefix, $category, $keys)
      */
     protected function fixCategoryValue($category, $key, $value)
     {
-        return array($category.$key, $value);
+        return [$category.$key, $value];
     }
 
     /**
diff --git a/lib/config/sfFactoryConfigHandler.class.php b/lib/config/sfFactoryConfigHandler.class.php
index e190d73de..ea73bcbf0 100644
--- a/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/config/sfFactoryConfigHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfFactoryConfigHandler extends sfYamlConfigHandler
+class sfFactoryConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -27,8 +27,8 @@ class sfFactoryConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
@@ -36,11 +36,11 @@ public function execute($configFiles)
         $config = static::getConfiguration($configFiles);
 
         // init our data and includes arrays
-        $includes = array();
-        $instances = array();
+        $includes = [];
+        $instances = [];
 
         // available list of factories
-        $factories = array('view_cache_manager', 'logger', 'i18n', 'controller', 'request', 'response', 'routing', 'storage', 'user', 'view_cache', 'mailer', 'service_container');
+        $factories = ['view_cache_manager', 'logger', 'i18n', 'controller', 'request', 'response', 'routing', 'storage', 'user', 'view_cache', 'mailer', 'service_container'];
 
         // let's do our fancy work
         foreach ($factories as $factory) {
@@ -49,7 +49,7 @@ public function execute($configFiles)
 
             if (!isset($keys['class'])) {
                 // missing class key
-                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $factory));
+                throw new \sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $factory));
             }
 
             $class = $keys['class'];
@@ -58,7 +58,7 @@ public function execute($configFiles)
                 // we have a file to include
                 if (!is_readable($keys['file'])) {
                     // factory file doesn't exist
-                    throw new sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $class, $keys['file']));
+                    throw new \sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $class, $keys['file']));
                 }
 
                 // append our data
@@ -66,10 +66,10 @@ public function execute($configFiles)
             }
 
             // parse parameters
-            $parameters = array();
+            $parameters = [];
             if (isset($keys['param'])) {
                 if (!is_array($keys['param'])) {
-                    throw new InvalidArgumentException(sprintf('The "param" key for the "%s" factory must be an array (in %s).', $class, $configFiles[0]));
+                    throw new \InvalidArgumentException(sprintf('The "param" key for the "%s" factory must be an array (in %s).', $class, $configFiles[0]));
                 }
 
                 $parameters = $keys['param'];
@@ -83,7 +83,7 @@ public function execute($configFiles)
                     break;
 
                 case 'request':
-                    $parameters['no_script_name'] = sfConfig::get('sf_no_script_name');
+                    $parameters['no_script_name'] = \sfConfig::get('sf_no_script_name');
                     $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_request', '%s');\n   \$this->factories['request'] = new \$class(\$this->dispatcher, array(), array(), sfConfig::get('sf_factory_request_parameters', %s), sfConfig::get('sf_factory_request_attributes', array()));", $class, var_export($parameters, true));
 
                     break;
@@ -96,7 +96,7 @@ public function execute($configFiles)
                     break;
 
                 case 'storage':
-                    $defaultParameters = array();
+                    $defaultParameters = [];
                     $defaultParameters[] = sprintf("'auto_shutdown' => false, 'session_id' => \$this->getRequest()->getParameter('%s'),", $parameters['session_name']);
                     if (is_subclass_of($class, 'sfDatabaseSessionStorage')) {
                         $defaultParameters[] = sprintf("'database' => \$this->getDatabaseManager()->getDatabase('%s'),", isset($parameters['database']) ? $parameters['database'] : 'default');
@@ -190,7 +190,7 @@ public function execute($configFiles)
 
                             if (!isset($keys['class'])) {
                                 // missing class key
-                                throw new sfParseException(sprintf('Configuration file "%s" specifies logger "%s" with missing class key.', $configFiles[0], $name));
+                                throw new \sfParseException(sprintf('Configuration file "%s" specifies logger "%s" with missing class key.', $configFiles[0], $name));
                             }
 
                             $condition = true;
@@ -259,7 +259,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfFilterConfigHandler.class.php b/lib/config/sfFilterConfigHandler.class.php
index 076c2af9e..870459e48 100644
--- a/lib/config/sfFilterConfigHandler.class.php
+++ b/lib/config/sfFilterConfigHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfFilterConfigHandler extends sfYamlConfigHandler
+class sfFilterConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -26,8 +26,8 @@ class sfFilterConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
@@ -35,8 +35,8 @@ public function execute($configFiles)
         $config = static::getConfiguration($configFiles);
 
         // init our data and includes arrays
-        $data = array();
-        $includes = array();
+        $data = [];
+        $includes = [];
 
         $execution = false;
         $rendering = false;
@@ -49,7 +49,7 @@ public function execute($configFiles)
 
             if (!isset($keys['class'])) {
                 // missing class key
-                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
+                throw new \sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
             }
 
             $class = $keys['class'];
@@ -57,7 +57,7 @@ public function execute($configFiles)
             if (isset($keys['file'])) {
                 if (!is_readable($keys['file'])) {
                     // filter file doesn't exist
-                    throw new sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $class, $keys['file']));
+                    throw new \sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $class, $keys['file']));
                 }
 
                 // append our data
@@ -95,11 +95,11 @@ public function execute($configFiles)
         }
 
         if (!$rendering) {
-            throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "rendering".', $configFiles[0]));
+            throw new \sfParseException(sprintf('Configuration file "%s" must register a filter of type "rendering".', $configFiles[0]));
         }
 
         if (!$execution) {
-            throw new sfParseException(sprintf('Configuration file "%s" must register a filter of type "execution".', $configFiles[0]));
+            throw new \sfParseException(sprintf('Configuration file "%s" must register a filter of type "execution".', $configFiles[0]));
         }
 
         // compile data
@@ -116,7 +116,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
@@ -125,16 +125,16 @@ public static function getConfiguration(array $configFiles)
             // we get the order of the new file and merge with the previous configurations
             $previous = $config;
 
-            $config = array();
+            $config = [];
             foreach (static::parseYaml($configFile) as $key => $value) {
                 $value = (array) $value;
-                $config[$key] = isset($previous[$key]) ? sfToolkit::arrayDeepMerge($previous[$key], $value) : $value;
+                $config[$key] = isset($previous[$key]) ? \sfToolkit::arrayDeepMerge($previous[$key], $value) : $value;
             }
 
             // check that every key in previous array is still present (to avoid problem when upgrading)
             foreach (array_keys($previous) as $key) {
                 if (!isset($config[$key])) {
-                    throw new sfConfigurationException(sprintf('The filter name "%s" is defined in "%s" but not present in "%s" file. To disable a filter, add a "enabled" key with a false value.', $key, $configFiles[$i], $configFile));
+                    throw new \sfConfigurationException(sprintf('The filter name "%s" is defined in "%s" but not present in "%s" file. To disable a filter, add a "enabled" key with a false value.', $key, $configFiles[$i], $configFile));
                 }
             }
         }
diff --git a/lib/config/sfGeneratorConfigHandler.class.php b/lib/config/sfGeneratorConfigHandler.class.php
index adcf8700c..676a56bfb 100644
--- a/lib/config/sfGeneratorConfigHandler.class.php
+++ b/lib/config/sfGeneratorConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfGeneratorConfigHandler extends sfYamlConfigHandler
+class sfGeneratorConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -24,9 +25,9 @@ class sfGeneratorConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException  If a requested configuration file does not exist or is not readable
-     * @throws sfParseException          If a requested configuration file is improperly formatted
-     * @throws sfInitializationException If a generator.yml key check fails
+     * @throws \sfConfigurationException  If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException          If a requested configuration file is improperly formatted
+     * @throws \sfInitializationException If a generator.yml key check fails
      */
     public function execute($configFiles)
     {
@@ -37,26 +38,26 @@ public function execute($configFiles)
         }
 
         if (!isset($config['generator'])) {
-            throw new sfParseException(sprintf('Configuration file "%s" must specify a generator section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0]));
+            throw new \sfParseException(sprintf('Configuration file "%s" must specify a generator section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0]));
         }
 
         $config = $config['generator'];
 
         if (!isset($config['class'])) {
-            throw new sfParseException(sprintf('Configuration file "%s" must specify a generator class section under the generator section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0]));
+            throw new \sfParseException(sprintf('Configuration file "%s" must specify a generator class section under the generator section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0]));
         }
 
-        foreach (array('fields', 'list', 'edit') as $section) {
+        foreach (['fields', 'list', 'edit'] as $section) {
             if (isset($config[$section])) {
-                throw new sfParseException(sprintf('Configuration file "%s" can specify a "%s" section but only under the param section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0], $section));
+                throw new \sfParseException(sprintf('Configuration file "%s" can specify a "%s" section but only under the param section.', isset($configFiles[1]) ? $configFiles[1] : $configFiles[0], $section));
             }
         }
 
         // generate class and add a reference to it
-        $generatorManager = new sfGeneratorManager(sfContext::getInstance()->getConfiguration());
+        $generatorManager = new \sfGeneratorManager(\sfContext::getInstance()->getConfiguration());
 
         // generator parameters
-        $generatorParam = (isset($config['param']) ? $config['param'] : array());
+        $generatorParam = (isset($config['param']) ? $config['param'] : []);
 
         // hack to find the module name (look for the last /modules/ in path)
         preg_match('#.*/modules/([^/]+)/#', str_replace('\\', '/', $configFiles[0]), $match);
@@ -71,13 +72,13 @@ public function execute($configFiles)
         return $retval;
     }
 
-    public static function getContent(sfGeneratorManager $generatorManager, $class, $parameters)
+    public static function getContent(\sfGeneratorManager $generatorManager, $class, $parameters)
     {
         return $generatorManager->generate($class, $parameters);
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfPluginConfiguration.class.php b/lib/config/sfPluginConfiguration.class.php
index babc1c5f1..d5f63a20a 100644
--- a/lib/config/sfPluginConfiguration.class.php
+++ b/lib/config/sfPluginConfiguration.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,11 +26,11 @@ abstract class sfPluginConfiguration
     /**
      * Constructor.
      *
-     * @param sfProjectConfiguration $configuration The project configuration
-     * @param string                 $rootDir       The plugin root directory
-     * @param string                 $name          The plugin name
+     * @param \sfProjectConfiguration $configuration The project configuration
+     * @param string                  $rootDir       The plugin root directory
+     * @param string                  $name          The plugin name
      */
-    public function __construct(sfProjectConfiguration $configuration, $rootDir = null, $name = null)
+    public function __construct(\sfProjectConfiguration $configuration, $rootDir = null, $name = null)
     {
         $this->configuration = $configuration;
         $this->dispatcher = $configuration->getEventDispatcher();
@@ -39,7 +40,7 @@ public function __construct(sfProjectConfiguration $configuration, $rootDir = nu
         $this->setup();
         $this->configure();
 
-        if (!$this->configuration instanceof sfApplicationConfiguration) {
+        if (!$this->configuration instanceof \sfApplicationConfiguration) {
             $this->initializeAutoload();
             $this->initialize();
         }
@@ -68,7 +69,7 @@ public function configure()
      *
      * This method is called after the plugin's classes have been added to sfAutoload.
      *
-     * @return bool|null If false sfApplicationConfiguration will look for a config.php (maintains BC with symfony < 1.2)
+     * @return \bool|null If false sfApplicationConfiguration will look for a config.php (maintains BC with symfony < 1.2)
      */
     public function initialize()
     {
@@ -101,16 +102,16 @@ public function getName()
      * configuration. Otherwise, autoload is handled in
      * {@link sfApplicationConfiguration} using {@link sfAutoload}.
      *
-     * @see sfSimpleAutoload
+     * @see \sfSimpleAutoload
      */
     public function initializeAutoload()
     {
-        $autoload = sfSimpleAutoload::getInstance(sfConfig::get('sf_cache_dir').'/project_autoload.cache');
+        $autoload = \sfSimpleAutoload::getInstance(\sfConfig::get('sf_cache_dir').'/project_autoload.cache');
 
         if (is_readable($file = $this->rootDir.'/config/autoload.yml')) {
-            $this->configuration->getEventDispatcher()->connect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
-            $autoload->loadConfiguration(array($file));
-            $this->configuration->getEventDispatcher()->disconnect('autoload.filter_config', array($this, 'filterAutoloadConfig'));
+            $this->configuration->getEventDispatcher()->connect('autoload.filter_config', [$this, 'filterAutoloadConfig']);
+            $autoload->loadConfiguration([$file]);
+            $this->configuration->getEventDispatcher()->disconnect('autoload.filter_config', [$this, 'filterAutoloadConfig']);
         } else {
             $autoload->addDirectory($this->rootDir.'/lib');
         }
@@ -123,26 +124,26 @@ public function initializeAutoload()
      *
      * @return array
      */
-    public function filterAutoloadConfig(sfEvent $event, array $config)
+    public function filterAutoloadConfig(\sfEvent $event, array $config)
     {
         // use array_merge so config is added to the front of the autoload array
         if (!isset($config['autoload'][$this->name.'_lib'])) {
-            $config['autoload'] = array_merge(array(
-                $this->name.'_lib' => array(
+            $config['autoload'] = array_merge([
+                $this->name.'_lib' => [
                     'path' => $this->rootDir.'/lib',
                     'recursive' => true,
-                ),
-            ), $config['autoload']);
+                ],
+            ], $config['autoload']);
         }
 
         if (!isset($config['autoload'][$this->name.'_module_libs'])) {
-            $config['autoload'] = array_merge(array(
-                $this->name.'_module_libs' => array(
+            $config['autoload'] = array_merge([
+                $this->name.'_module_libs' => [
                     'path' => $this->rootDir.'/modules/*/lib',
                     'recursive' => true,
                     'prefix' => 1,
-                ),
-            ), $config['autoload']);
+                ],
+            ], $config['autoload']);
         }
 
         return $config;
@@ -153,7 +154,7 @@ public function filterAutoloadConfig(sfEvent $event, array $config)
      */
     public function connectTests()
     {
-        $this->dispatcher->connect('task.test.filter_test_files', array($this, 'filterTestFiles'));
+        $this->dispatcher->connect('task.test.filter_test_files', [$this, 'filterTestFiles']);
     }
 
     /**
@@ -163,27 +164,27 @@ public function connectTests()
      *
      * @return array An array of files with the appropriate tests from the current plugin merged in
      */
-    public function filterTestFiles(sfEvent $event, $files)
+    public function filterTestFiles(\sfEvent $event, $files)
     {
         $task = $event->getSubject();
 
-        if ($task instanceof sfTestAllTask) {
+        if ($task instanceof \sfTestAllTask) {
             $directory = $this->rootDir.'/test';
-            $names = array();
-        } elseif ($task instanceof sfTestFunctionalTask) {
+            $names = [];
+        } elseif ($task instanceof \sfTestFunctionalTask) {
             $directory = $this->rootDir.'/test/functional';
             $names = $event['arguments']['controller'];
-        } elseif ($task instanceof sfTestUnitTask) {
+        } elseif ($task instanceof \sfTestUnitTask) {
             $directory = $this->rootDir.'/test/unit';
             $names = $event['arguments']['name'];
         }
 
         if (!count($names)) {
-            $names = array('*');
+            $names = ['*'];
         }
 
         foreach ($names as $name) {
-            $finder = sfFinder::type('file')->follow_link()->name(basename($name).'Test.php');
+            $finder = \sfFinder::type('file')->follow_link()->name(basename($name).'Test.php');
             $files = array_merge($files, $finder->in($directory.'/'.dirname($name)));
         }
 
@@ -197,7 +198,7 @@ public function filterTestFiles(sfEvent $event, $files)
      */
     protected function guessRootDir()
     {
-        $r = new ReflectionClass(get_class($this));
+        $r = new \ReflectionClass(get_class($this));
 
         return realpath(dirname($r->getFileName()).'/..');
     }
diff --git a/lib/config/sfPluginConfigurationGeneric.class.php b/lib/config/sfPluginConfigurationGeneric.class.php
index d7d9eff99..70fe0f77a 100644
--- a/lib/config/sfPluginConfigurationGeneric.class.php
+++ b/lib/config/sfPluginConfigurationGeneric.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginConfigurationGeneric extends sfPluginConfiguration
+class sfPluginConfigurationGeneric extends \sfPluginConfiguration
 {
     /**
-     * @see sfPluginConfiguration
+     * @see \sfPluginConfiguration
      */
     public function initialize()
     {
diff --git a/lib/config/sfProjectConfiguration.class.php b/lib/config/sfProjectConfiguration.class.php
index 0f8c12fed..d8f21c897 100644
--- a/lib/config/sfProjectConfiguration.class.php
+++ b/lib/config/sfProjectConfiguration.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,51 +24,51 @@ class sfProjectConfiguration
     /** @var string */
     protected $symfonyLibDir;
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
     /** @var array */
-    protected $plugins = array();
+    protected $plugins = [];
 
     /** @var array */
-    protected $pluginPaths = array();
+    protected $pluginPaths = [];
 
     /** @var array */
-    protected $overriddenPluginPaths = array();
+    protected $overriddenPluginPaths = [];
 
     /** @var sfPluginConfiguration[] */
-    protected $pluginConfigurations = array();
+    protected $pluginConfigurations = [];
 
     /** @var bool */
     protected $pluginsLoaded = false;
 
-    /** @var sfApplicationConfiguration */
+    /** @var \sfApplicationConfiguration */
     protected static $active;
 
     /**
      * Constructor.
      *
-     * @param string            $rootDir    The project root directory
-     * @param sfEventDispatcher $dispatcher The event dispatcher
+     * @param string             $rootDir    The project root directory
+     * @param \sfEventDispatcher $dispatcher The event dispatcher
      */
-    public function __construct($rootDir = null, sfEventDispatcher $dispatcher = null)
+    public function __construct($rootDir = null, \sfEventDispatcher $dispatcher = null)
     {
-        if (null === self::$active || $this instanceof sfApplicationConfiguration) {
+        if (null === self::$active || $this instanceof \sfApplicationConfiguration) {
             self::$active = $this;
         }
 
         $this->rootDir = null === $rootDir ? static::guessRootDir() : realpath($rootDir);
         $this->symfonyLibDir = realpath(__DIR__.'/..');
-        $this->dispatcher = null === $dispatcher ? new sfEventDispatcher() : $dispatcher;
+        $this->dispatcher = null === $dispatcher ? new \sfEventDispatcher() : $dispatcher;
 
         ini_set('magic_quotes_runtime', 'off');
 
-        sfConfig::set('sf_symfony_lib_dir', $this->symfonyLibDir);
+        \sfConfig::set('sf_symfony_lib_dir', $this->symfonyLibDir);
 
         $this->setRootDir($this->rootDir);
 
         // provide forms the dispatcher
-        sfFormSymfony::setEventDispatcher($this->dispatcher);
+        \sfFormSymfony::setEventDispatcher($this->dispatcher);
 
         $this->setup();
 
@@ -83,13 +84,13 @@ public function __construct($rootDir = null, sfEventDispatcher $dispatcher = nul
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'configuration.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'configuration.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -119,7 +120,7 @@ public function loadPlugins()
                 require_once $file;
                 $configuration = new $class($this, $path, $plugin);
             } else {
-                $configuration = new sfPluginConfigurationGeneric($this, $path, $plugin);
+                $configuration = new \sfPluginConfigurationGeneric($this, $path, $plugin);
             }
 
             $this->pluginConfigurations[$plugin] = $configuration;
@@ -146,7 +147,7 @@ public function setRootDir($rootDir)
     {
         $this->rootDir = $rootDir;
 
-        sfConfig::add(array(
+        \sfConfig::add([
             'sf_root_dir' => $rootDir,
 
             // global directory structure
@@ -157,7 +158,7 @@ public function setRootDir($rootDir)
             'sf_config_dir' => $rootDir.DIRECTORY_SEPARATOR.'config',
             'sf_test_dir' => $rootDir.DIRECTORY_SEPARATOR.'test',
             'sf_plugins_dir' => $rootDir.DIRECTORY_SEPARATOR.'plugins',
-        ));
+        ]);
 
         $this->setWebDir($rootDir.DIRECTORY_SEPARATOR.'web');
         $this->setCacheDir($rootDir.DIRECTORY_SEPARATOR.'cache');
@@ -180,7 +181,7 @@ public function getRootDir()
      */
     public function setCacheDir($cacheDir)
     {
-        sfConfig::set('sf_cache_dir', $cacheDir);
+        \sfConfig::set('sf_cache_dir', $cacheDir);
     }
 
     /**
@@ -190,7 +191,7 @@ public function setCacheDir($cacheDir)
      */
     public function setLogDir($logDir)
     {
-        sfConfig::set('sf_log_dir', $logDir);
+        \sfConfig::set('sf_log_dir', $logDir);
     }
 
     /**
@@ -200,11 +201,11 @@ public function setLogDir($logDir)
      */
     public function setWebDir($webDir)
     {
-        sfConfig::add(array(
+        \sfConfig::add([
             'sf_web_dir' => $webDir,
             'sf_upload_dir_name' => $uploadDirName = 'uploads',
             'sf_upload_dir' => $webDir.DIRECTORY_SEPARATOR.$uploadDirName,
-        ));
+        ]);
     }
 
     /**
@@ -217,7 +218,7 @@ public function getModelDirs()
     {
         return array_merge(
             $this->getPluginSubPaths('/lib/model'),     // plugins
-            array(sfConfig::get('sf_lib_dir').'/model') // project
+            [\sfConfig::get('sf_lib_dir').'/model'] // project
         );
     }
 
@@ -232,9 +233,9 @@ public function getModelDirs()
     public function getGeneratorTemplateDirs($class, $theme)
     {
         return array_merge(
-            array(sfConfig::get('sf_data_dir').'/generator/'.$class.'/'.$theme.'/template'), // project
+            [\sfConfig::get('sf_data_dir').'/generator/'.$class.'/'.$theme.'/template'], // project
             $this->getPluginSubPaths('/data/generator/'.$class.'/'.$theme.'/template'),      // plugins
-            array(sfConfig::get('sf_data_dir').'/generator/'.$class.'/default/template'),    // project (default theme)
+            [\sfConfig::get('sf_data_dir').'/generator/'.$class.'/default/template'],    // project (default theme)
             $this->getPluginSubPaths('/data/generator/'.$class.'/default/template')          // plugins (default theme)
         );
     }
@@ -250,9 +251,9 @@ public function getGeneratorTemplateDirs($class, $theme)
     public function getGeneratorSkeletonDirs($class, $theme)
     {
         return array_merge(
-            array(sfConfig::get('sf_data_dir').'/generator/'.$class.'/'.$theme.'/skeleton'), // project
+            [\sfConfig::get('sf_data_dir').'/generator/'.$class.'/'.$theme.'/skeleton'], // project
             $this->getPluginSubPaths('/data/generator/'.$class.'/'.$theme.'/skeleton'),      // plugins
-            array(sfConfig::get('sf_data_dir').'/generator/'.$class.'/default/skeleton'),    // project (default theme)
+            [\sfConfig::get('sf_data_dir').'/generator/'.$class.'/default/skeleton'],    // project (default theme)
             $this->getPluginSubPaths('/data/generator/'.$class.'/default/skeleton')          // plugins (default theme)
         );
     }
@@ -266,7 +267,7 @@ public function getGeneratorSkeletonDirs($class, $theme)
      *
      * @return string A template path
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function getGeneratorTemplate($class, $theme, $path)
     {
@@ -277,7 +278,7 @@ public function getGeneratorTemplate($class, $theme, $path)
             }
         }
 
-        throw new sfException(sprintf('Unable to load "%s" generator template in: %s.', $path, implode(', ', $dirs)));
+        throw new \sfException(sprintf('Unable to load "%s" generator template in: %s.', $path, implode(', ', $dirs)));
     }
 
     /**
@@ -291,9 +292,9 @@ public function getConfigPaths($configPath)
     {
         $globalConfigPath = basename(dirname($configPath)).'/'.basename($configPath);
 
-        $files = array(
+        $files = [
             $this->getSymfonyLibDir().'/config/'.$globalConfigPath, // symfony
-        );
+        ];
 
         foreach ($this->getPluginPaths() as $path) {
             if (is_file($file = $path.'/'.$globalConfigPath)) {
@@ -301,10 +302,10 @@ public function getConfigPaths($configPath)
             }
         }
 
-        $files = array_merge($files, array(
+        $files = array_merge($files, [
             $this->getRootDir().'/'.$globalConfigPath,              // project
             $this->getRootDir().'/'.$configPath,                    // project
-        ));
+        ]);
 
         foreach ($this->getPluginPaths() as $path) {
             if (is_file($file = $path.'/'.$configPath)) {
@@ -312,7 +313,7 @@ public function getConfigPaths($configPath)
             }
         }
 
-        $configs = array();
+        $configs = [];
         foreach (array_unique($files) as $file) {
             if (is_readable($file)) {
                 $configs[] = $file;
@@ -327,17 +328,17 @@ public function getConfigPaths($configPath)
      *
      * @param array $plugins An array of plugin names
      *
-     * @throws LogicException If plugins have already been loaded
+     * @throws \LogicException If plugins have already been loaded
      */
     public function setPlugins(array $plugins)
     {
         if ($this->pluginsLoaded) {
-            throw new LogicException('Plugins have already been loaded.');
+            throw new \LogicException('Plugins have already been loaded.');
         }
 
         $this->plugins = $plugins;
 
-        $this->pluginPaths = array();
+        $this->pluginPaths = [];
     }
 
     /**
@@ -351,7 +352,7 @@ public function enablePlugins($plugins)
             if (func_num_args() > 1) {
                 $plugins = func_get_args();
             } else {
-                $plugins = array($plugins);
+                $plugins = [$plugins];
             }
         }
 
@@ -363,27 +364,27 @@ public function enablePlugins($plugins)
      *
      * @param array|string $plugins A plugin name or a plugin list
      *
-     * @throws LogicException If plugins have already been loaded
+     * @throws \LogicException If plugins have already been loaded
      */
     public function disablePlugins($plugins)
     {
         if ($this->pluginsLoaded) {
-            throw new LogicException('Plugins have already been loaded.');
+            throw new \LogicException('Plugins have already been loaded.');
         }
 
         if (!is_array($plugins)) {
-            $plugins = array($plugins);
+            $plugins = [$plugins];
         }
 
         foreach ($plugins as $plugin) {
             if (false !== $pos = array_search($plugin, $this->plugins)) {
                 unset($this->plugins[$pos]);
             } else {
-                throw new InvalidArgumentException(sprintf('The plugin "%s" does not exist.', $plugin));
+                throw new \InvalidArgumentException(sprintf('The plugin "%s" does not exist.', $plugin));
             }
         }
 
-        $this->pluginPaths = array();
+        $this->pluginPaths = [];
     }
 
     /**
@@ -391,12 +392,12 @@ public function disablePlugins($plugins)
      *
      * @param array|string $plugins A plugin name or a plugin list
      *
-     * @throws LogicException If plugins have already been loaded
+     * @throws \LogicException If plugins have already been loaded
      */
-    public function enableAllPluginsExcept($plugins = array())
+    public function enableAllPluginsExcept($plugins = [])
     {
         if ($this->pluginsLoaded) {
-            throw new LogicException('Plugins have already been loaded.');
+            throw new \LogicException('Plugins have already been loaded.');
         }
 
         $this->plugins = array_keys($this->getAllPluginPaths());
@@ -429,7 +430,7 @@ public function getPluginSubPaths($subPath = '')
             return $this->pluginPaths[$subPath];
         }
 
-        $this->pluginPaths[$subPath] = array();
+        $this->pluginPaths[$subPath] = [];
         $pluginPaths = $this->getPluginPaths();
         foreach ($pluginPaths as $pluginPath) {
             if (is_dir($pluginPath.$subPath)) {
@@ -445,19 +446,19 @@ public function getPluginSubPaths($subPath = '')
      *
      * @return array the plugin root paths
      *
-     * @throws InvalidArgumentException If an enabled plugin does not exist
+     * @throws \InvalidArgumentException If an enabled plugin does not exist
      */
     public function getPluginPaths()
     {
         if (!isset($this->pluginPaths[''])) {
             $pluginPaths = $this->getAllPluginPaths();
 
-            $this->pluginPaths[''] = array();
+            $this->pluginPaths[''] = [];
             foreach ($this->getPlugins() as $plugin) {
                 if (isset($pluginPaths[$plugin])) {
                     $this->pluginPaths[''][] = $pluginPaths[$plugin];
                 } else {
-                    throw new InvalidArgumentException(sprintf('The plugin "%s" does not exist.', $plugin));
+                    throw new \InvalidArgumentException(sprintf('The plugin "%s" does not exist.', $plugin));
                 }
             }
         }
@@ -472,15 +473,15 @@ public function getPluginPaths()
      */
     public function getAllPluginPaths()
     {
-        $pluginPaths = array();
+        $pluginPaths = [];
 
         // search for *Plugin directories representing plugins
         // follow links and do not recurse. No need to exclude VC because they do not end with *Plugin
-        $finder = sfFinder::type('dir')->maxdepth(0)->ignore_version_control(false)->follow_link()->name('*Plugin');
-        $dirs = array(
+        $finder = \sfFinder::type('dir')->maxdepth(0)->ignore_version_control(false)->follow_link()->name('*Plugin');
+        $dirs = [
             $this->getSymfonyLibDir().'/plugins',
-            sfConfig::get('sf_plugins_dir'),
-        );
+            \sfConfig::get('sf_plugins_dir'),
+        ];
 
         foreach ($finder->in($dirs) as $path) {
             $pluginPaths[basename($path)] = $path;
@@ -513,12 +514,12 @@ public function setPluginPath($plugin, $path)
      *
      * @param string $name
      *
-     * @return sfPluginConfiguration
+     * @return \sfPluginConfiguration
      */
     public function getPluginConfiguration($name)
     {
         if (!isset($this->pluginConfigurations[$name])) {
-            throw new InvalidArgumentException(sprintf('There is no configuration object for the "%s" object.', $name));
+            throw new \InvalidArgumentException(sprintf('There is no configuration object for the "%s" object.', $name));
         }
 
         return $this->pluginConfigurations[$name];
@@ -527,7 +528,7 @@ public function getPluginConfiguration($name)
     /**
      * Returns the event dispatcher.
      *
-     * @return sfEventDispatcher A sfEventDispatcher instance
+     * @return \sfEventDispatcher A sfEventDispatcher instance
      */
     public function getEventDispatcher()
     {
@@ -547,12 +548,12 @@ public function getSymfonyLibDir()
     /**
      * Returns the active configuration.
      *
-     * @return sfApplicationConfiguration The current sfProjectConfiguration instance
+     * @return \sfApplicationConfiguration The current sfProjectConfiguration instance
      */
     public static function getActive()
     {
         if (!static::hasActive()) {
-            throw new RuntimeException('There is no active configuration.');
+            throw new \RuntimeException('There is no active configuration.');
         }
 
         return self::$active;
@@ -575,7 +576,7 @@ public static function hasActive()
      */
     public static function guessRootDir()
     {
-        $r = new ReflectionClass('ProjectConfiguration');
+        $r = new \ReflectionClass('ProjectConfiguration');
 
         return realpath(dirname($r->getFileName()).'/..');
     }
@@ -583,15 +584,15 @@ public static function guessRootDir()
     /**
      * Returns a sfApplicationConfiguration configuration for a given application.
      *
-     * @param string            $application An application name
-     * @param string            $environment The environment name
-     * @param bool              $debug       true to enable debug mode
-     * @param string            $rootDir     The project root directory
-     * @param sfEventDispatcher $dispatcher  An event dispatcher
+     * @param string             $application An application name
+     * @param string             $environment The environment name
+     * @param bool               $debug       true to enable debug mode
+     * @param string             $rootDir     The project root directory
+     * @param \sfEventDispatcher $dispatcher  An event dispatcher
      *
-     * @return sfApplicationConfiguration A sfApplicationConfiguration instance
+     * @return \sfApplicationConfiguration A sfApplicationConfiguration instance
      */
-    public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
+    public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, \sfEventDispatcher $dispatcher = null)
     {
         $class = $application.'Configuration';
 
@@ -600,7 +601,7 @@ public static function getApplicationConfiguration($application, $environment, $
         }
 
         if (!is_file($file = $rootDir.'/apps/'.$application.'/config/'.$class.'.class.php')) {
-            throw new InvalidArgumentException(sprintf('The application "%s" does not exist.', $application));
+            throw new \InvalidArgumentException(sprintf('The application "%s" does not exist.', $application));
         }
 
         require_once $file;
diff --git a/lib/config/sfRootConfigHandler.class.php b/lib/config/sfRootConfigHandler.class.php
index e4837cae6..d8d120dd0 100644
--- a/lib/config/sfRootConfigHandler.class.php
+++ b/lib/config/sfRootConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfRootConfigHandler extends sfYamlConfigHandler
+class sfRootConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -25,8 +26,8 @@ class sfRootConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
@@ -42,8 +43,8 @@ public function execute($configFiles)
         }
 
         // init our data and includes arrays
-        $data = array();
-        $includes = array();
+        $data = [];
+        $includes = [];
 
         // let's do our fancy work
         foreach ($config as $category => $keys) {
@@ -55,7 +56,7 @@ public function execute($configFiles)
 
             if (!isset($keys['class'])) {
                 // missing class key
-                throw new sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
+                throw new \sfParseException(sprintf('Configuration file "%s" specifies category "%s" with missing class key.', $configFiles[0], $category));
             }
 
             $class = $keys['class'];
@@ -63,7 +64,7 @@ public function execute($configFiles)
             if (isset($keys['file'])) {
                 if (!is_readable($keys['file'])) {
                     // handler file doesn't exist
-                    throw new sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $class, $keys['file']));
+                    throw new \sfParseException(sprintf('Configuration file "%s" specifies class "%s" with nonexistent or unreadable file "%s".', $configFiles[0], $class, $keys['file']));
                 }
 
                 // append our data
@@ -91,7 +92,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfRoutingConfigHandler.class.php b/lib/config/sfRoutingConfigHandler.class.php
index ac82d5cc9..c5b30a1c8 100644
--- a/lib/config/sfRoutingConfigHandler.class.php
+++ b/lib/config/sfRoutingConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfRoutingConfigHandler extends sfYamlConfigHandler
+class sfRoutingConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -22,23 +23,23 @@ class sfRoutingConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public function execute($configFiles)
     {
         $options = $this->getOptions();
         unset($options['cache']);
 
-        $data = array();
+        $data = [];
         foreach ($this->parse($configFiles) as $name => $routeConfig) {
-            $r = new ReflectionClass($routeConfig[0]);
+            $r = new \ReflectionClass($routeConfig[0]);
 
-            /** @var sfRoute $route */
+            /** @var \sfRoute $route */
             $route = $r->newInstanceArgs($routeConfig[1]);
 
-            $routes = $route instanceof sfRouteCollection ? $route : array($name => $route);
-            foreach (sfPatternRouting::flattenRoutes($routes) as $name => $route) {
+            $routes = $route instanceof \sfRouteCollection ? $route : [$name => $route];
+            foreach (\sfPatternRouting::flattenRoutes($routes) as $name => $route) {
                 $route->setDefaultOptions($options);
                 $data[] = sprintf('$this->routes[\'%s\'] = %s;', $name, var_export(serialize($route), true));
             }
@@ -57,9 +58,9 @@ public function evaluate($configFiles)
     {
         $routeDefinitions = $this->parse($configFiles);
 
-        $routes = array();
+        $routes = [];
         foreach ($routeDefinitions as $name => $route) {
-            $r = new ReflectionClass($route[0]);
+            $r = new \ReflectionClass($route[0]);
             $routes[$name] = $r->newInstanceArgs($route[1]);
         }
 
@@ -67,7 +68,7 @@ public function evaluate($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
@@ -76,7 +77,7 @@ public static function getConfiguration(array $configFiles)
 
     protected function getOptions()
     {
-        $config = sfFactoryConfigHandler::getConfiguration(sfContext::getInstance()->getConfiguration()->getConfigPaths('config/factories.yml'));
+        $config = \sfFactoryConfigHandler::getConfiguration(\sfContext::getInstance()->getConfiguration()->getConfigPaths('config/factories.yml'));
 
         return $config['routing']['param'];
     }
@@ -87,24 +88,24 @@ protected function parse($configFiles)
         $config = static::getConfiguration($configFiles);
 
         // collect routes
-        $routes = array();
+        $routes = [];
         foreach ($config as $name => $params) {
             if (
                 (isset($params['type']) && 'collection' == $params['type'])
-                || (isset($params['class']) && false !== strpos($params['class'], 'Collection'))
+                || (isset($params['class']) &&   str_contains($params['class'], 'Collection'))
             ) {
-                $options = isset($params['options']) ? $params['options'] : array();
+                $options = isset($params['options']) ? $params['options'] : [];
                 $options['name'] = $name;
-                $options['requirements'] = isset($params['requirements']) ? $params['requirements'] : array();
+                $options['requirements'] = isset($params['requirements']) ? $params['requirements'] : [];
 
-                $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRouteCollection', array($options));
+                $routes[$name] = [isset($params['class']) ? $params['class'] : 'sfRouteCollection', [$options]];
             } else {
-                $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRoute', array(
+                $routes[$name] = [isset($params['class']) ? $params['class'] : 'sfRoute', [
                     $params['url'] ?: '/',
-                    isset($params['params']) ? $params['params'] : (isset($params['param']) ? $params['param'] : array()),
-                    isset($params['requirements']) ? $params['requirements'] : array(),
-                    isset($params['options']) ? $params['options'] : array(),
-                ));
+                    isset($params['params']) ? $params['params'] : (isset($params['param']) ? $params['param'] : []),
+                    isset($params['requirements']) ? $params['requirements'] : [],
+                    isset($params['options']) ? $params['options'] : [],
+                ]];
             }
         }
 
diff --git a/lib/config/sfSecurityConfigHandler.class.php b/lib/config/sfSecurityConfigHandler.class.php
index dd0b8aa64..fba190960 100644
--- a/lib/config/sfSecurityConfigHandler.class.php
+++ b/lib/config/sfSecurityConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfSecurityConfigHandler extends sfYamlConfigHandler
+class sfSecurityConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -24,9 +25,9 @@ class sfSecurityConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException  If a requested configuration file does not exist or is not readable
-     * @throws sfParseException          If a requested configuration file is improperly formatted
-     * @throws sfInitializationException If a view.yml key check fails
+     * @throws \sfConfigurationException  If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException          If a requested configuration file is improperly formatted
+     * @throws \sfInitializationException If a view.yml key check fails
      */
     public function execute($configFiles)
     {
@@ -46,7 +47,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfServiceConfigHandler.class.php b/lib/config/sfServiceConfigHandler.class.php
index 2bc86f8d0..27d6215b6 100644
--- a/lib/config/sfServiceConfigHandler.class.php
+++ b/lib/config/sfServiceConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfServiceConfigHandler extends sfYamlConfigHandler
+class sfServiceConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -26,18 +27,18 @@ class sfServiceConfigHandler extends sfYamlConfigHandler
      */
     public function execute($configFiles)
     {
-        $class = sfConfig::get('sf_app').'_'.sfConfig::get('sf_environment').'ServiceContainer';
+        $class = \sfConfig::get('sf_app').'_'.\sfConfig::get('sf_environment').'ServiceContainer';
 
-        $serviceContainerBuilder = new sfServiceContainerBuilder();
+        $serviceContainerBuilder = new \sfServiceContainerBuilder();
 
-        $loader = new sfServiceContainerLoaderArray($serviceContainerBuilder);
+        $loader = new \sfServiceContainerLoaderArray($serviceContainerBuilder);
         $loader->load(static::getConfiguration($configFiles));
 
-        $dumper = new sfServiceContainerDumperPhp($serviceContainerBuilder);
-        $code = $dumper->dump(array(
+        $dumper = new \sfServiceContainerDumperPhp($serviceContainerBuilder);
+        $code = $dumper->dump([
             'class' => $class,
             'base_class' => $this->parameterHolder->get('base_class'),
-        ));
+        ]);
 
         // compile data
         $retval = sprintf(
@@ -58,7 +59,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfSimpleYamlConfigHandler.class.php b/lib/config/sfSimpleYamlConfigHandler.class.php
index 827f77e24..836b34d4f 100644
--- a/lib/config/sfSimpleYamlConfigHandler.class.php
+++ b/lib/config/sfSimpleYamlConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfSimpleYamlConfigHandler extends sfYamlConfigHandler
+class sfSimpleYamlConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -38,7 +39,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
diff --git a/lib/config/sfViewConfigHandler.class.php b/lib/config/sfViewConfigHandler.class.php
index 56230c775..d881775da 100644
--- a/lib/config/sfViewConfigHandler.class.php
+++ b/lib/config/sfViewConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfViewConfigHandler extends sfYamlConfigHandler
+class sfViewConfigHandler extends \sfYamlConfigHandler
 {
     /**
      * Executes this configuration handler.
@@ -24,9 +25,9 @@ class sfViewConfigHandler extends sfYamlConfigHandler
      *
      * @return string Data to be written to a cache file
      *
-     * @throws sfConfigurationException  If a requested configuration file does not exist or is not readable
-     * @throws sfParseException          If a requested configuration file is improperly formatted
-     * @throws sfInitializationException If a view.yml key check fails
+     * @throws \sfConfigurationException  If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException          If a requested configuration file is improperly formatted
+     * @throws \sfInitializationException If a view.yml key check fails
      */
     public function execute($configFiles)
     {
@@ -34,7 +35,7 @@ public function execute($configFiles)
         $this->yamlConfig = static::getConfiguration($configFiles);
 
         // init our data array
-        $data = array();
+        $data = [];
 
         $data[] = "\$response = \$this->context->getResponse();\n\n";
 
@@ -104,7 +105,7 @@ public function execute($configFiles)
     }
 
     /**
-     * @see sfConfigHandler
+     * @see \sfConfigHandler
      */
     public static function getConfiguration(array $configFiles)
     {
@@ -125,7 +126,7 @@ protected function addComponentSlots($viewName = '')
         $components = $this->mergeConfigValue('components', $viewName);
         foreach ($components as $name => $component) {
             if (!is_array($component) || count($component) < 1) {
-                $component = array(null, null);
+                $component = [null, null];
             }
 
             $data .= "  \$this->setComponentSlot('{$name}', '{$component[0]}', '{$component[1]}');\n";
@@ -215,14 +216,14 @@ protected function addLayout($viewName = '')
      */
     protected function addHtmlHead($viewName = '')
     {
-        $data = array();
+        $data = [];
 
         foreach ($this->mergeConfigValue('http_metas', $viewName) as $httpequiv => $content) {
             $data[] = sprintf("  \$response->addHttpMeta('%s', '%s', false);", $httpequiv, str_replace('\'', '\\\'', $content));
         }
 
         foreach ($this->mergeConfigValue('metas', $viewName) as $name => $content) {
-            $data[] = sprintf("  \$response->addMeta('%s', '%s', false, false);", $name, str_replace('\'', '\\\'', preg_replace('/&amp;(?=\w+;)/', '&', htmlspecialchars((string) $content, ENT_QUOTES, sfConfig::get('sf_charset')))));
+            $data[] = sprintf("  \$response->addMeta('%s', '%s', false, false);", $name, str_replace('\'', '\\\'', preg_replace('/&amp;(?=\w+;)/', '&', htmlspecialchars((string) $content, ENT_QUOTES, \sfConfig::get('sf_charset')))));
         }
 
         return implode("\n", $data)."\n";
@@ -257,7 +258,7 @@ protected function addHtmlAsset($viewName = '')
      */
     protected function addEscaping($viewName = '')
     {
-        $data = array();
+        $data = [];
 
         $escaping = $this->getConfigValue('escaping', $viewName);
 
@@ -271,16 +272,16 @@ protected function addEscaping($viewName = '')
     protected static function mergeConfig($config)
     {
         // merge javascripts and stylesheets
-        $config['all']['stylesheets'] = array_merge(isset($config['default']['stylesheets']) && is_array($config['default']['stylesheets']) ? $config['default']['stylesheets'] : array(), isset($config['all']['stylesheets']) && is_array($config['all']['stylesheets']) ? $config['all']['stylesheets'] : array());
+        $config['all']['stylesheets'] = array_merge(isset($config['default']['stylesheets']) && is_array($config['default']['stylesheets']) ? $config['default']['stylesheets'] : [], isset($config['all']['stylesheets']) && is_array($config['all']['stylesheets']) ? $config['all']['stylesheets'] : []);
         unset($config['default']['stylesheets']);
 
-        $config['all']['javascripts'] = array_merge(isset($config['default']['javascripts']) && is_array($config['default']['javascripts']) ? $config['default']['javascripts'] : array(), isset($config['all']['javascripts']) && is_array($config['all']['javascripts']) ? $config['all']['javascripts'] : array());
+        $config['all']['javascripts'] = array_merge(isset($config['default']['javascripts']) && is_array($config['default']['javascripts']) ? $config['default']['javascripts'] : [], isset($config['all']['javascripts']) && is_array($config['all']['javascripts']) ? $config['all']['javascripts'] : []);
         unset($config['default']['javascripts']);
 
         // merge default and all
-        $config['all'] = sfToolkit::arrayDeepMerge(
-            isset($config['default']) && is_array($config['default']) ? $config['default'] : array(),
-            isset($config['all']) && is_array($config['all']) ? $config['all'] : array()
+        $config['all'] = \sfToolkit::arrayDeepMerge(
+            isset($config['default']) && is_array($config['default']) ? $config['default'] : [],
+            isset($config['all']) && is_array($config['all']) ? $config['all'] : []
         );
 
         unset($config['default']);
@@ -298,7 +299,7 @@ protected static function mergeConfig($config)
      */
     private function addAssets($type, $assets)
     {
-        $tmp = array();
+        $tmp = [];
         foreach ((array) $assets as $asset) {
             $position = '';
             if (is_array($asset)) {
@@ -311,11 +312,11 @@ private function addAssets($type, $assets)
                 }
             } else {
                 $key = $asset;
-                $options = array();
+                $options = [];
             }
 
             if ('-*' == $key) {
-                $tmp = array();
+                $tmp = [];
             } elseif ('-' == $key[0]) {
                 unset($tmp[substr($key, 1)]);
             } else {
diff --git a/lib/config/sfYamlConfigHandler.class.php b/lib/config/sfYamlConfigHandler.class.php
index c2993a80f..95ff9b4f2 100644
--- a/lib/config/sfYamlConfigHandler.class.php
+++ b/lib/config/sfYamlConfigHandler.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfYamlConfigHandler extends sfConfigHandler
+abstract class sfYamlConfigHandler extends \sfConfigHandler
 {
     /** @var array */
     protected $yamlConfig;
@@ -30,17 +31,17 @@ abstract class sfYamlConfigHandler extends sfConfigHandler
      */
     public static function parseYamls($configFiles)
     {
-        $config = array();
+        $config = [];
         foreach ($configFiles as $configFile) {
             // the first level is an environment and its value must be an array
-            $values = array();
+            $values = [];
             foreach (static::parseYaml($configFile) as $env => $value) {
                 if (null !== $value) {
                     $values[$env] = $value;
                 }
             }
 
-            $config = sfToolkit::arrayDeepMerge($config, $values);
+            $config = \sfToolkit::arrayDeepMerge($config, $values);
         }
 
         return $config;
@@ -53,32 +54,32 @@ public static function parseYamls($configFiles)
      *
      * @return array|string A parsed .yml configuration
      *
-     * @throws sfConfigurationException If a requested configuration file does not exist or is not readable
-     * @throws sfParseException         If a requested configuration file is improperly formatted
+     * @throws \sfConfigurationException If a requested configuration file does not exist or is not readable
+     * @throws \sfParseException         If a requested configuration file is improperly formatted
      */
     public static function parseYaml($configFile)
     {
         if (!is_readable($configFile)) {
             // can't read the configuration
-            throw new sfConfigurationException(sprintf('Configuration file "%s" does not exist or is not readable.', $configFile));
+            throw new \sfConfigurationException(sprintf('Configuration file "%s" does not exist or is not readable.', $configFile));
         }
 
         // parse our config
-        $config = sfYaml::load($configFile, sfConfig::get('sf_charset', 'UTF-8'));
+        $config = \sfYaml::load($configFile, \sfConfig::get('sf_charset', 'UTF-8'));
 
         if (false === $config) {
             // configuration couldn't be parsed
-            throw new sfParseException(sprintf('Configuration file "%s" could not be parsed', $configFile));
+            throw new \sfParseException(sprintf('Configuration file "%s" could not be parsed', $configFile));
         }
 
-        return null === $config ? array() : $config;
+        return null === $config ? [] : $config;
     }
 
     public static function flattenConfiguration($config)
     {
-        $config['all'] = sfToolkit::arrayDeepMerge(
-            isset($config['default']) && is_array($config['default']) ? $config['default'] : array(),
-            isset($config['all']) && is_array($config['all']) ? $config['all'] : array()
+        $config['all'] = \sfToolkit::arrayDeepMerge(
+            isset($config['default']) && is_array($config['default']) ? $config['default'] : [],
+            isset($config['all']) && is_array($config['all']) ? $config['all'] : []
         );
 
         unset($config['default']);
@@ -95,10 +96,10 @@ public static function flattenConfiguration($config)
      */
     public static function flattenConfigurationWithEnvironment($config)
     {
-        return sfToolkit::arrayDeepMerge(
-            isset($config['default']) && is_array($config['default']) ? $config['default'] : array(),
-            isset($config['all']) && is_array($config['all']) ? $config['all'] : array(),
-            isset($config[sfConfig::get('sf_environment')]) && is_array($config[sfConfig::get('sf_environment')]) ? $config[sfConfig::get('sf_environment')] : array()
+        return \sfToolkit::arrayDeepMerge(
+            isset($config['default']) && is_array($config['default']) ? $config['default'] : [],
+            isset($config['all']) && is_array($config['all']) ? $config['all'] : [],
+            isset($config[\sfConfig::get('sf_environment')]) && is_array($config[\sfConfig::get('sf_environment')]) ? $config[\sfConfig::get('sf_environment')] : []
         );
     }
 
@@ -112,7 +113,7 @@ public static function flattenConfigurationWithEnvironment($config)
      */
     protected function mergeConfigValue($keyName, $category)
     {
-        $values = array();
+        $values = [];
 
         if (isset($this->yamlConfig['all'][$keyName]) && is_array($this->yamlConfig['all'][$keyName])) {
             $values = $this->yamlConfig['all'][$keyName];
diff --git a/lib/controller/default/actions/actions.class.php b/lib/controller/default/actions/actions.class.php
index 5dfa30554..7e5866ba0 100644
--- a/lib/controller/default/actions/actions.class.php
+++ b/lib/controller/default/actions/actions.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class defaultActions extends sfActions
+class defaultActions extends \sfActions
 {
     /**
      * Congratulations page for creating an application.
diff --git a/lib/controller/default/templates/defaultLayout.php b/lib/controller/default/templates/defaultLayout.php
index 1898f65a8..8aa94057f 100644
--- a/lib/controller/default/templates/defaultLayout.php
+++ b/lib/controller/default/templates/defaultLayout.php
@@ -18,7 +18,7 @@
 </head>
 <body>
 <div class="sfTContainer">
-  <?php echo link_to(image_tag('/sf/sf_default/images/sfTLogo.png', array('alt' => 'symfony PHP Framework', 'class' => 'sfTLogo', 'size' => '186x39')), 'http://www.symfony-project.org/'); ?>
+  <?php echo link_to(image_tag('/sf/sf_default/images/sfTLogo.png', ['alt' => 'symfony PHP Framework', 'class' => 'sfTLogo', 'size' => '186x39']), 'http://www.symfony-project.org/'); ?>
   <?php echo $sf_content; ?>
 </div>
 </body>
diff --git a/lib/controller/default/templates/disabledSuccess.php b/lib/controller/default/templates/disabledSuccess.php
index 1f76fbff2..d52ff435b 100644
--- a/lib/controller/default/templates/disabledSuccess.php
+++ b/lib/controller/default/templates/disabledSuccess.php
@@ -1,7 +1,7 @@
 <?php decorate_with(__DIR__.'/defaultLayout.php'); ?>
 
 <div class="sfTMessageContainer sfTAlert"> 
-  <?php echo image_tag('/sf/sf_default/images/icons/disabled48.png', array('alt' => 'module disabled', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
+  <?php echo image_tag('/sf/sf_default/images/icons/disabled48.png', ['alt' => 'module disabled', 'class' => 'sfTMessageIcon', 'size' => '48x48']); ?>
   <div class="sfTMessageWrap">
     <h1>This Module is Unavailable</h1>
     <h5>This module has been disabled.</h5>
diff --git a/lib/controller/default/templates/error404Success.php b/lib/controller/default/templates/error404Success.php
index 919af7520..9a65929a1 100644
--- a/lib/controller/default/templates/error404Success.php
+++ b/lib/controller/default/templates/error404Success.php
@@ -1,7 +1,7 @@
 <?php decorate_with(__DIR__.'/defaultLayout.php'); ?>
 
 <div class="sfTMessageContainer sfTAlert"> 
-  <?php echo image_tag('/sf/sf_default/images/icons/cancel48.png', array('alt' => 'page not found', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
+  <?php echo image_tag('/sf/sf_default/images/icons/cancel48.png', ['alt' => 'page not found', 'class' => 'sfTMessageIcon', 'size' => '48x48']); ?>
   <div class="sfTMessageWrap">
     <h1>Oops! Page Not Found</h1>
     <h5>The server returned a 404 response.</h5>
diff --git a/lib/controller/default/templates/indexSuccess.php b/lib/controller/default/templates/indexSuccess.php
index b50638f39..9d887fb63 100644
--- a/lib/controller/default/templates/indexSuccess.php
+++ b/lib/controller/default/templates/indexSuccess.php
@@ -1,7 +1,7 @@
 <?php decorate_with(__DIR__.'/defaultLayout.php'); ?>
 
 <div class="sfTMessageContainer sfTMessage"> 
-  <?php echo image_tag('/sf/sf_default/images/icons/ok48.png', array('alt' => 'ok', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
+  <?php echo image_tag('/sf/sf_default/images/icons/ok48.png', ['alt' => 'ok', 'class' => 'sfTMessageIcon', 'size' => '48x48']); ?>
   <div class="sfTMessageWrap">
     <h1>Symfony Project Created</h1>
     <h5>Congratulations! You have successfully created your symfony project.</h5>
diff --git a/lib/controller/default/templates/loginSuccess.php b/lib/controller/default/templates/loginSuccess.php
index f1b5c7e0e..5efb66c0e 100644
--- a/lib/controller/default/templates/loginSuccess.php
+++ b/lib/controller/default/templates/loginSuccess.php
@@ -1,7 +1,7 @@
 <?php decorate_with(__DIR__.'/defaultLayout.php'); ?>
 
 <div class="sfTMessageContainer sfTLock"> 
-  <?php echo image_tag('/sf/sf_default/images/icons/lock48.png', array('alt' => 'login required', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
+  <?php echo image_tag('/sf/sf_default/images/icons/lock48.png', ['alt' => 'login required', 'class' => 'sfTMessageIcon', 'size' => '48x48']); ?>
   <div class="sfTMessageWrap">
     <h1>Login Required</h1>
     <h5>This page is not public.</h5>
@@ -14,7 +14,7 @@
   <dt>What's Next</dt>
   <dd>
     <ul class="sfTIconList">
-      <li class="sfTLinkMessage"><?php echo link_to('Proceed to login', sfConfig::get('sf_login_module').'/'.sfConfig::get('sf_login_action')); ?></li>
+      <li class="sfTLinkMessage"><?php echo link_to('Proceed to login', \sfConfig::get('sf_login_module').'/'.\sfConfig::get('sf_login_action')); ?></li>
       <li class="sfTLinkMessage"><a href="javascript:history.go(-1)">Back to previous page</a></li>
     </ul>
   </dd>
diff --git a/lib/controller/default/templates/moduleSuccess.php b/lib/controller/default/templates/moduleSuccess.php
index b4dc0bdcd..0e0c92180 100644
--- a/lib/controller/default/templates/moduleSuccess.php
+++ b/lib/controller/default/templates/moduleSuccess.php
@@ -1,7 +1,7 @@
 <?php decorate_with(__DIR__.'/defaultLayout.php'); ?>
 
 <div class="sfTMessageContainer sfTMessage"> 
-  <?php echo image_tag('/sf/sf_default/images/icons/ok48.png', array('alt' => 'module created', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
+  <?php echo image_tag('/sf/sf_default/images/icons/ok48.png', ['alt' => 'module created', 'class' => 'sfTMessageIcon', 'size' => '48x48']); ?>
   <div class="sfTMessageWrap">
     <h1>Module "<?php echo $sf_params->get('module'); ?>" created</h1>
     <h5>Congratulations! You have successfully created a symfony module.</h5>
@@ -14,7 +14,7 @@
   <dt>What's next</dt>
   <dd>
     <ul class="sfTIconList">
-      <li class="sfTDirectoryMessage">Browse to the <code>apps/<?php echo sfContext::getInstance()->getConfiguration()->getApplication(); ?>/modules/<?php echo $sf_params->get('module'); ?>/</code> directory</li>
+      <li class="sfTDirectoryMessage">Browse to the <code>apps/<?php echo \sfContext::getInstance()->getConfiguration()->getApplication(); ?>/modules/<?php echo $sf_params->get('module'); ?>/</code> directory</li>
       <li class="sfTEditMessage">In <code>actions/actions.class.php</code>, edit the <code>executeIndex()</code> method and remove the final <code>forward</code></li>
       <li class="sfTColorMessage">Customize the <code>templates/indexSuccess.php</code> template</li>
       <li class="sfTLinkMessage"><?php echo link_to('Learn more from the online documentation', 'http://www.symfony-project.org/doc'); ?></li>
diff --git a/lib/controller/default/templates/secureSuccess.php b/lib/controller/default/templates/secureSuccess.php
index 3151ff665..912963b26 100644
--- a/lib/controller/default/templates/secureSuccess.php
+++ b/lib/controller/default/templates/secureSuccess.php
@@ -1,7 +1,7 @@
 <?php decorate_with(__DIR__.'/defaultLayout.php'); ?>
 
 <div class="sfTMessageContainer sfTLock"> 
-  <?php echo image_tag('/sf/sf_default/images/icons/lock48.png', array('alt' => 'credentials required', 'class' => 'sfTMessageIcon', 'size' => '48x48')); ?>
+  <?php echo image_tag('/sf/sf_default/images/icons/lock48.png', ['alt' => 'credentials required', 'class' => 'sfTMessageIcon', 'size' => '48x48']); ?>
   <div class="sfTMessageWrap">
     <h1>Credentials Required</h1>
     <h5>This page is in a restricted area.</h5>
diff --git a/lib/controller/sfController.class.php b/lib/controller/sfController.class.php
index c654d3e38..eb8c097fb 100644
--- a/lib/controller/sfController.class.php
+++ b/lib/controller/sfController.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  */
 abstract class sfController
 {
-    /** @var sfContext */
+    /** @var \sfContext */
     protected $context;
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
     /** @var string[] */
-    protected $controllerClasses = array();
+    protected $controllerClasses = [];
 
     /** @var int */
-    protected $renderMode = sfView::RENDER_CLIENT;
+    protected $renderMode = \sfView::RENDER_CLIENT;
 
     /** @var int */
     protected $maxForwards = 5;
@@ -39,7 +39,7 @@ abstract class sfController
      *
      * @see initialize()
      *
-     * @param sfContext $context A sfContext implementation instance
+     * @param \sfContext $context A sfContext implementation instance
      */
     public function __construct($context)
     {
@@ -54,13 +54,13 @@ public function __construct($context)
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'controller.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'controller.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -69,7 +69,7 @@ public function __call($method, $arguments)
     /**
      * Initializes this controller.
      *
-     * @param sfContext $context A sfContext implementation instance
+     * @param \sfContext $context A sfContext implementation instance
      */
     public function initialize($context)
     {
@@ -109,10 +109,10 @@ public function actionExists($moduleName, $actionName)
      * @param string $moduleName A module name
      * @param string $actionName An action name
      *
-     * @throws sfConfigurationException  If an invalid configuration setting has been found
-     * @throws sfForwardException        If an error occurs while forwarding the request
-     * @throws sfError404Exception       If the action not exist
-     * @throws sfInitializationException If the action could not be initialized
+     * @throws \sfConfigurationException  If an invalid configuration setting has been found
+     * @throws \sfForwardException        If an error occurs while forwarding the request
+     * @throws \sfError404Exception       If the action not exist
+     * @throws \sfInitializationException If the action could not be initialized
      */
     public function forward($moduleName, $actionName)
     {
@@ -122,7 +122,7 @@ public function forward($moduleName, $actionName)
 
         if ($this->getActionStack()->getSize() >= $this->maxForwards) {
             // let's kill this party before it turns into cpu cycle hell
-            throw new sfForwardException('Too many forwards have been detected for this request.');
+            throw new \sfForwardException('Too many forwards have been detected for this request.');
         }
 
         // check for a module generator config file
@@ -130,11 +130,11 @@ public function forward($moduleName, $actionName)
 
         if (!$this->actionExists($moduleName, $actionName)) {
             // the requested action doesn't exist
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Action "%s/%s" does not exist', $moduleName, $actionName))));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Action "%s/%s" does not exist', $moduleName, $actionName)]));
             }
 
-            throw new sfError404Exception(sprintf('Action "%s/%s" does not exist.', $moduleName, $actionName));
+            throw new \sfError404Exception(sprintf('Action "%s/%s" does not exist.', $moduleName, $actionName));
         }
 
         // create an instance of the action
@@ -144,43 +144,43 @@ public function forward($moduleName, $actionName)
         $this->getActionStack()->addEntry($moduleName, $actionName, $actionInstance);
 
         // include module configuration
-        $viewClass = sfConfig::get('mod_'.strtolower($moduleName).'_view_class', false);
+        $viewClass = \sfConfig::get('mod_'.strtolower($moduleName).'_view_class', false);
 
         require $this->context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml');
         if (false !== $viewClass) {
-            sfConfig::set('mod_'.strtolower($moduleName).'_view_class', $viewClass);
+            \sfConfig::set('mod_'.strtolower($moduleName).'_view_class', $viewClass);
         }
 
         // module enabled?
-        if (sfConfig::get('mod_'.strtolower($moduleName).'_enabled')) {
+        if (\sfConfig::get('mod_'.strtolower($moduleName).'_enabled')) {
             // check for a module config.php
-            $moduleConfig = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/config/config.php';
+            $moduleConfig = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/config/config.php';
             if (is_readable($moduleConfig)) {
                 require_once $moduleConfig;
             }
 
             // create a new filter chain
-            $filterChain = new sfFilterChain();
+            $filterChain = new \sfFilterChain();
             $filterChain->loadConfiguration($actionInstance);
 
-            $this->context->getEventDispatcher()->notify(new sfEvent($this, 'controller.change_action', array('module' => $moduleName, 'action' => $actionName)));
+            $this->context->getEventDispatcher()->notify(new \sfEvent($this, 'controller.change_action', ['module' => $moduleName, 'action' => $actionName]));
 
-            if ($moduleName == sfConfig::get('sf_error_404_module') && $actionName == sfConfig::get('sf_error_404_action')) {
+            if ($moduleName == \sfConfig::get('sf_error_404_module') && $actionName == \sfConfig::get('sf_error_404_action')) {
                 $this->context->getResponse()->setStatusCode(404);
                 $this->context->getResponse()->setHttpHeader('Status', '404 Not Found');
 
-                $this->dispatcher->notify(new sfEvent($this, 'controller.page_not_found', array('module' => $moduleName, 'action' => $actionName)));
+                $this->dispatcher->notify(new \sfEvent($this, 'controller.page_not_found', ['module' => $moduleName, 'action' => $actionName]));
             }
 
             // process the filter chain
             $filterChain->execute();
         } else {
-            $moduleName = sfConfig::get('sf_module_disabled_module');
-            $actionName = sfConfig::get('sf_module_disabled_action');
+            $moduleName = \sfConfig::get('sf_module_disabled_module');
+            $actionName = \sfConfig::get('sf_module_disabled_action');
 
             if (!$this->actionExists($moduleName, $actionName)) {
                 // cannot find mod disabled module/action
-                throw new sfConfigurationException(sprintf('Invalid configuration settings: [sf_module_disabled_module] "%s", [sf_module_disabled_action] "%s".', $moduleName, $actionName));
+                throw new \sfConfigurationException(sprintf('Invalid configuration settings: [sf_module_disabled_module] "%s", [sf_module_disabled_action] "%s".', $moduleName, $actionName));
             }
 
             $this->forward($moduleName, $actionName);
@@ -193,7 +193,7 @@ public function forward($moduleName, $actionName)
      * @param string $moduleName A module name
      * @param string $actionName An action name
      *
-     * @return sfAction An sfAction implementation instance, if the action exists, otherwise null
+     * @return \sfAction An sfAction implementation instance, if the action exists, otherwise null
      */
     public function getAction($moduleName, $actionName)
     {
@@ -206,7 +206,7 @@ public function getAction($moduleName, $actionName)
      * @param string $moduleName    A module name
      * @param string $componentName A component name
      *
-     * @return sfComponent A sfComponent implementation instance, if the component exists, otherwise null
+     * @return \sfComponent A sfComponent implementation instance, if the component exists, otherwise null
      */
     public function getComponent($moduleName, $componentName)
     {
@@ -216,7 +216,7 @@ public function getComponent($moduleName, $componentName)
     /**
      * Retrieves the action stack.
      *
-     * @return sfActionStack An sfActionStack instance, if the action stack is enabled, otherwise null
+     * @return \sfActionStack An sfActionStack instance, if the action stack is enabled, otherwise null
      */
     public function getActionStack()
     {
@@ -242,12 +242,12 @@ public function getRenderMode()
      * @param string $actionName An action name
      * @param string $viewName   A view name
      *
-     * @return sfView A sfView implementation instance, if the view exists, otherwise null
+     * @return \sfView A sfView implementation instance, if the view exists, otherwise null
      */
     public function getView($moduleName, $actionName, $viewName)
     {
         // user view exists?
-        $file = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/view/'.$actionName.$viewName.'View.class.php';
+        $file = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/view/'.$actionName.$viewName.'View.class.php';
 
         if (is_readable($file)) {
             require_once $file;
@@ -262,7 +262,7 @@ public function getView($moduleName, $actionName, $viewName)
             }
         } else {
             // view class (as configured in module.yml or defined in action)
-            $class = sfConfig::get('mod_'.strtolower($moduleName).'_view_class', 'sfPHP').'View';
+            $class = \sfConfig::get('mod_'.strtolower($moduleName).'_view_class', 'sfPHP').'View';
         }
 
         return new $class($this->context, $moduleName, $actionName, $viewName);
@@ -277,20 +277,20 @@ public function getView($moduleName, $actionName, $viewName)
      *
      * @return string The generated content
      *
-     * @throws Exception
-     * @throws sfException
+     * @throws \Exception
+     * @throws \sfException
      */
     public function getPresentationFor($module, $action, $viewName = null)
     {
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Get presentation for action "%s/%s" (view class: "%s")', $module, $action, $viewName))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Get presentation for action "%s/%s" (view class: "%s")', $module, $action, $viewName)]));
         }
 
         // get original render mode
         $renderMode = $this->getRenderMode();
 
         // set render mode to var
-        $this->setRenderMode(sfView::RENDER_VAR);
+        $this->setRenderMode(\sfView::RENDER_VAR);
 
         // grab the action stack
         $actionStack = $this->getActionStack();
@@ -300,20 +300,20 @@ public function getPresentationFor($module, $action, $viewName = null)
 
         // set viewName if needed
         if ($viewName) {
-            $currentViewName = sfConfig::get('mod_'.strtolower($module).'_view_class');
-            sfConfig::set('mod_'.strtolower($module).'_view_class', $viewName);
+            $currentViewName = \sfConfig::get('mod_'.strtolower($module).'_view_class');
+            \sfConfig::set('mod_'.strtolower($module).'_view_class', $viewName);
         }
 
         try {
             // forward to the action
             $this->forward($module, $action);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // put render mode back
             $this->setRenderMode($renderMode);
 
             // remove viewName
             if ($viewName) {
-                sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
+                \sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
             }
 
             throw $e;
@@ -333,17 +333,17 @@ public function getPresentationFor($module, $action, $viewName = null)
         while ($nb-- > 0) {
             $actionEntry = $actionStack->popEntry();
 
-            if ($actionEntry->getModuleName() == sfConfig::get('sf_login_module') && $actionEntry->getActionName() == sfConfig::get('sf_login_action')) {
-                throw new sfException('Your action is secured, but the user is not authenticated.');
+            if ($actionEntry->getModuleName() == \sfConfig::get('sf_login_module') && $actionEntry->getActionName() == \sfConfig::get('sf_login_action')) {
+                throw new \sfException('Your action is secured, but the user is not authenticated.');
             }
-            if ($actionEntry->getModuleName() == sfConfig::get('sf_secure_module') && $actionEntry->getActionName() == sfConfig::get('sf_secure_action')) {
-                throw new sfException('Your action is secured, but the user does not have access.');
+            if ($actionEntry->getModuleName() == \sfConfig::get('sf_secure_module') && $actionEntry->getActionName() == \sfConfig::get('sf_secure_action')) {
+                throw new \sfException('Your action is secured, but the user does not have access.');
             }
         }
 
         // remove viewName
         if ($viewName) {
-            sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
+            \sfConfig::set('mod_'.strtolower($module).'_view_class', $currentViewName);
         }
 
         return $presentation;
@@ -357,18 +357,18 @@ public function getPresentationFor($module, $action, $viewName = null)
      *                  - sfView::RENDER_VAR
      *                  - sfView::RENDER_NONE
      *
-     * @throws sfRenderException If an invalid render mode has been set
+     * @throws \sfRenderException If an invalid render mode has been set
      */
     public function setRenderMode($mode)
     {
-        if (sfView::RENDER_CLIENT == $mode || sfView::RENDER_VAR == $mode || sfView::RENDER_NONE == $mode) {
+        if (\sfView::RENDER_CLIENT == $mode || \sfView::RENDER_VAR == $mode || \sfView::RENDER_NONE == $mode) {
             $this->renderMode = $mode;
 
             return;
         }
 
         // invalid rendering mode type
-        throw new sfRenderException(sprintf('Invalid rendering mode: %s.', $mode));
+        throw new \sfRenderException(sprintf('Invalid rendering mode: %s.', $mode));
     }
 
     /**
@@ -392,16 +392,16 @@ public function inCLI()
      *
      * @return bool true if the controller exists, false otherwise
      *
-     * @throws sfConfigurationException thrown if the module is not enabled
-     * @throws sfControllerException    thrown if the controller doesn't exist and the $throwExceptions parameter is set to true
+     * @throws \sfConfigurationException thrown if the module is not enabled
+     * @throws \sfControllerException    thrown if the controller doesn't exist and the $throwExceptions parameter is set to true
      */
     protected function controllerExists($moduleName, $controllerName, $extension, $throwExceptions)
     {
         $dirs = $this->context->getConfiguration()->getControllerDirs($moduleName);
         foreach ($dirs as $dir => $checkEnabled) {
             // plugin module enabled?
-            if ($checkEnabled && !in_array($moduleName, sfConfig::get('sf_enabled_modules')) && is_readable($dir)) {
-                throw new sfConfigurationException(sprintf('The module "%s" is not enabled.', $moduleName));
+            if ($checkEnabled && !in_array($moduleName, \sfConfig::get('sf_enabled_modules')) && is_readable($dir)) {
+                throw new \sfConfigurationException(sprintf('The module "%s" is not enabled.', $moduleName));
             }
 
             // check for a module generator config file
@@ -427,7 +427,7 @@ protected function controllerExists($moduleName, $controllerName, $extension, $t
 
                 if (!class_exists($moduleName.$classSuffix.'s', false)) {
                     if ($throwExceptions) {
-                        throw new sfControllerException(sprintf('There is no "%s" class in your action file "%s".', $moduleName.$classSuffix.'s', $module_file));
+                        throw new \sfControllerException(sprintf('There is no "%s" class in your action file "%s".', $moduleName.$classSuffix.'s', $module_file));
                     }
 
                     return false;
@@ -436,7 +436,7 @@ protected function controllerExists($moduleName, $controllerName, $extension, $t
                 // action is defined in this class?
                 if (!in_array('execute'.ucfirst($controllerName), get_class_methods($moduleName.$classSuffix.'s'))) {
                     if ($throwExceptions) {
-                        throw new sfControllerException(sprintf('There is no "%s" method in your action class "%s".', 'execute'.ucfirst($controllerName), $moduleName.$classSuffix.'s'));
+                        throw new \sfControllerException(sprintf('There is no "%s" method in your action class "%s".', 'execute'.ucfirst($controllerName), $moduleName.$classSuffix.'s'));
                     }
 
                     return false;
@@ -449,10 +449,10 @@ protected function controllerExists($moduleName, $controllerName, $extension, $t
         }
 
         // send an exception if debug
-        if ($throwExceptions && sfConfig::get('sf_debug')) {
-            $dirs = array_map(array('sfDebug', 'shortenFilePath'), array_keys($dirs));
+        if ($throwExceptions && \sfConfig::get('sf_debug')) {
+            $dirs = array_map(['sfDebug', 'shortenFilePath'], array_keys($dirs));
 
-            throw new sfControllerException(sprintf('Controller "%s/%s" does not exist in: %s.', $moduleName, $controllerName, implode(', ', $dirs)));
+            throw new \sfControllerException(sprintf('Controller "%s/%s" does not exist in: %s.', $moduleName, $controllerName, implode(', ', $dirs)));
         }
 
         return false;
@@ -465,7 +465,7 @@ protected function controllerExists($moduleName, $controllerName, $extension, $t
      * @param string $controllerName A component name
      * @param string $extension      Either 'action' or 'component' depending on the type of controller to look for
      *
-     * @return sfAction A controller implementation instance, if the controller exists, otherwise null
+     * @return \sfAction A controller implementation instance, if the controller exists, otherwise null
      *
      * @see getComponent(), getAction()
      */
diff --git a/lib/controller/sfFrontWebController.class.php b/lib/controller/sfFrontWebController.class.php
index 5e2becdd5..667ca5de5 100644
--- a/lib/controller/sfFrontWebController.class.php
+++ b/lib/controller/sfFrontWebController.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfFrontWebController extends sfWebController
+class sfFrontWebController extends \sfWebController
 {
     /**
      * Dispatches a request.
@@ -30,24 +30,24 @@ public function dispatch()
     {
         try {
             // reinitialize filters (needed for unit and functional tests)
-            sfFilter::$filterCalled = array();
+            \sfFilter::$filterCalled = [];
 
             // determine our module and action
-            /** @var sfWebRequest $request */
+            /** @var \sfWebRequest $request */
             $request = $this->context->getRequest();
             $moduleName = $request->getParameter('module');
             $actionName = $request->getParameter('action');
 
             if (empty($moduleName) || empty($actionName)) {
-                throw new sfError404Exception(sprintf('Empty module and/or action after parsing the URL "%s" (%s/%s).', $request->getPathInfo(), $moduleName, $actionName));
+                throw new \sfError404Exception(sprintf('Empty module and/or action after parsing the URL "%s" (%s/%s).', $request->getPathInfo(), $moduleName, $actionName));
             }
 
             // make the first request
             $this->forward($moduleName, $actionName);
-        } catch (sfException $e) {
+        } catch (\sfException $e) {
             $e->printStackTrace();
-        } catch (Exception $e) {
-            sfException::createFromException($e)->printStackTrace();
+        } catch (\Exception $e) {
+            \sfException::createFromException($e)->printStackTrace();
         }
     }
 }
diff --git a/lib/controller/sfWebController.class.php b/lib/controller/sfWebController.class.php
index b4ca30b67..297a1179c 100644
--- a/lib/controller/sfWebController.class.php
+++ b/lib/controller/sfWebController.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfWebController extends sfController
+abstract class sfWebController extends \sfController
 {
     /**
      * Generates an URL from an array of parameters.
@@ -27,7 +27,7 @@ abstract class sfWebController extends sfController
      *
      * @return string A URL to a symfony resource
      */
-    public function genUrl($parameters = array(), $absolute = false)
+    public function genUrl($parameters = [], $absolute = false)
     {
         $route = '';
         $fragment = '';
@@ -39,7 +39,7 @@ public function genUrl($parameters = array(), $absolute = false)
             }
 
             // relative URL?
-            if (0 === strpos($parameters, '/')) {
+            if (str_starts_with($parameters, '/')) {
                 return $parameters;
             }
 
@@ -78,13 +78,13 @@ public function genUrl($parameters = array(), $absolute = false)
      *
      * @return array An array of parameters
      *
-     * @throws sfParseException
+     * @throws \sfParseException
      */
     public function convertUrlStringToParameters($url)
     {
         $givenUrl = $url;
 
-        $params = array();
+        $params = [];
         $queryString = '';
         $route = '';
 
@@ -111,12 +111,12 @@ public function convertUrlStringToParameters($url)
         // routeName?
         if ($url && '@' == $url[0]) {
             $route = substr($url, 1);
-        } elseif (false !== strpos($url, '/')) {
+        } elseif (str_contains($url, '/')) {
             list($params['module'], $params['action']) = explode('/', $url);
         } elseif (!$queryString) {
             $route = $givenUrl;
         } else {
-            throw new InvalidArgumentException(sprintf('An internal URI must contain a module and an action (module/action) ("%s" given).', $givenUrl));
+            throw new \InvalidArgumentException(sprintf('An internal URI must contain a module and an action (module/action) ("%s" given).', $givenUrl));
         }
 
         // split the query string
@@ -135,11 +135,11 @@ public function convertUrlStringToParameters($url)
 
             // check that all string is matched
             if (!$matched) {
-                throw new sfParseException(sprintf('Unable to parse query string "%s".', $queryString));
+                throw new \sfParseException(sprintf('Unable to parse query string "%s".', $queryString));
             }
         }
 
-        return array($route, $params);
+        return [$route, $params];
     }
 
     /**
@@ -150,24 +150,24 @@ public function convertUrlStringToParameters($url)
      *                                 browsers that do not support HTTP headers
      * @param int          $statusCode The status code
      *
-     * @throws InvalidArgumentException If the url argument is null or an empty string
+     * @throws \InvalidArgumentException If the url argument is null or an empty string
      */
     public function redirect($url, $delay = 0, $statusCode = 302)
     {
         if (empty($url)) {
-            throw new InvalidArgumentException('Cannot redirect to an empty URL.');
+            throw new \InvalidArgumentException('Cannot redirect to an empty URL.');
         }
 
         $url = $this->genUrl($url, true);
         // see #8083
         $url = str_replace('&amp;', '&', $url);
 
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Redirect to "%s"', $url))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Redirect to "%s"', $url)]));
         }
 
         // redirect
-        /** @var sfWebResponse $response */
+        /** @var \sfWebResponse $response */
         $response = $this->context->getResponse();
         $response->clearHttpHeaders();
         $response->setStatusCode($statusCode);
@@ -178,7 +178,7 @@ public function redirect($url, $delay = 0, $statusCode = 302)
             $response->setHttpHeader('Location', $url);
         }
 
-        $response->setContent(sprintf('<html><head><meta http-equiv="refresh" content="%d;url=%s"/></head></html>', $delay, htmlspecialchars($url, ENT_QUOTES, sfConfig::get('sf_charset'))));
+        $response->setContent(sprintf('<html><head><meta http-equiv="refresh" content="%d;url=%s"/></head></html>', $delay, htmlspecialchars($url, ENT_QUOTES, \sfConfig::get('sf_charset'))));
         $response->send();
     }
 }
diff --git a/lib/database/sfDatabase.class.php b/lib/database/sfDatabase.class.php
index 3ff9862b8..bc4352543 100644
--- a/lib/database/sfDatabase.class.php
+++ b/lib/database/sfDatabase.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +20,7 @@
  */
 abstract class sfDatabase
 {
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $parameterHolder;
 
     /** @var PDO|resource */
@@ -36,7 +36,7 @@ abstract class sfDatabase
      *
      * @param array $parameters An associative array of initialization parameters
      */
-    public function __construct($parameters = array())
+    public function __construct($parameters = [])
     {
         $this->initialize($parameters);
     }
@@ -46,18 +46,18 @@ public function __construct($parameters = array())
      *
      * @param array $parameters An associative array of initialization parameters
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfDatabase object
+     * @throws \sfInitializationException If an error occurs while initializing this sfDatabase object
      */
-    public function initialize($parameters = array())
+    public function initialize($parameters = [])
     {
-        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder = new \sfParameterHolder();
         $this->parameterHolder->add($parameters);
     }
 
     /**
      * Connects to the database.
      *
-     * @throws sfDatabaseException If a connection could not be created
+     * @throws \sfDatabaseException If a connection could not be created
      */
     abstract public function connect();
 
@@ -69,7 +69,7 @@ abstract public function connect();
      *
      * @return mixed A database connection
      *
-     * @throws sfDatabaseException If a connection could not be retrieved
+     * @throws \sfDatabaseException If a connection could not be retrieved
      */
     public function getConnection()
     {
@@ -85,7 +85,7 @@ public function getConnection()
      *
      * @return mixed A database resource
      *
-     * @throws sfDatabaseException If a resource could not be retrieved
+     * @throws \sfDatabaseException If a resource could not be retrieved
      */
     public function getResource()
     {
@@ -99,7 +99,7 @@ public function getResource()
     /**
      * Gets the parameter holder for this object.
      *
-     * @return sfParameterHolder A sfParameterHolder instance
+     * @return \sfParameterHolder A sfParameterHolder instance
      */
     public function getParameterHolder()
     {
@@ -118,7 +118,7 @@ public function getParameterHolder()
      *
      * @return string The value associated with the key
      *
-     * @see sfParameterHolder
+     * @see \sfParameterHolder
      */
     public function getParameter($name, $default = null)
     {
@@ -136,7 +136,7 @@ public function getParameter($name, $default = null)
      *
      * @return bool true if the given key exists, false otherwise
      *
-     * @see sfParameterHolder
+     * @see \sfParameterHolder
      */
     public function hasParameter($name)
     {
@@ -153,7 +153,7 @@ public function hasParameter($name)
      * @param string $name  The key name
      * @param string $value The value
      *
-     * @see sfParameterHolder
+     * @see \sfParameterHolder
      */
     public function setParameter($name, $value)
     {
@@ -163,7 +163,7 @@ public function setParameter($name, $value)
     /**
      * Executes the shutdown procedure.
      *
-     * @throws sfDatabaseException If an error occurs while shutting down this database
+     * @throws \sfDatabaseException If an error occurs while shutting down this database
      */
     abstract public function shutdown();
 }
diff --git a/lib/database/sfDatabaseManager.class.php b/lib/database/sfDatabaseManager.class.php
index ae0a6927e..ab09eb9f8 100644
--- a/lib/database/sfDatabaseManager.class.php
+++ b/lib/database/sfDatabaseManager.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +21,9 @@
  */
 class sfDatabaseManager
 {
-    /** @var sfProjectConfiguration */
+    /** @var \sfProjectConfiguration */
     protected $configuration;
-    protected $databases = array();
+    protected $databases = [];
 
     /**
      * Class constructor.
@@ -32,23 +32,23 @@ class sfDatabaseManager
      *
      * @param array $options
      */
-    public function __construct(sfProjectConfiguration $configuration, $options = array())
+    public function __construct(\sfProjectConfiguration $configuration, $options = [])
     {
         $this->initialize($configuration);
 
         if (!isset($options['auto_shutdown']) || $options['auto_shutdown']) {
-            register_shutdown_function(array($this, 'shutdown'));
+            register_shutdown_function([$this, 'shutdown']);
         }
     }
 
     /**
      * Initializes this sfDatabaseManager object.
      *
-     * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance
+     * @param \sfProjectConfiguration $configuration A sfProjectConfiguration instance
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfDatabaseManager object
+     * @throws \sfInitializationException If an error occurs while initializing this sfDatabaseManager object
      */
-    public function initialize(sfProjectConfiguration $configuration)
+    public function initialize(\sfProjectConfiguration $configuration)
     {
         $this->configuration = $configuration;
 
@@ -60,11 +60,11 @@ public function initialize(sfProjectConfiguration $configuration)
      */
     public function loadConfiguration()
     {
-        if ($this->configuration instanceof sfApplicationConfiguration) {
+        if ($this->configuration instanceof \sfApplicationConfiguration) {
             $databases = include $this->configuration->getConfigCache()->checkConfig('config/databases.yml');
         } else {
-            $configHandler = new sfDatabaseConfigHandler();
-            $databases = $configHandler->evaluate(array($this->configuration->getRootDir().'/config/databases.yml'));
+            $configHandler = new \sfDatabaseConfigHandler();
+            $databases = $configHandler->evaluate([$this->configuration->getRootDir().'/config/databases.yml']);
         }
 
         foreach ($databases as $name => $database) {
@@ -75,10 +75,10 @@ public function loadConfiguration()
     /**
      * Sets a database connection.
      *
-     * @param string     $name     The database name
-     * @param sfDatabase $database A sfDatabase instance
+     * @param string      $name     The database name
+     * @param \sfDatabase $database A sfDatabase instance
      */
-    public function setDatabase($name, sfDatabase $database)
+    public function setDatabase($name, \sfDatabase $database)
     {
         $this->databases[$name] = $database;
     }
@@ -90,7 +90,7 @@ public function setDatabase($name, sfDatabase $database)
      *
      * @return mixed A Database instance
      *
-     * @throws sfDatabaseException If the requested database name does not exist
+     * @throws \sfDatabaseException If the requested database name does not exist
      */
     public function getDatabase($name = 'default')
     {
@@ -99,7 +99,7 @@ public function getDatabase($name = 'default')
         }
 
         // nonexistent database name
-        throw new sfDatabaseException(sprintf('Database "%s" does not exist.', $name));
+        throw new \sfDatabaseException(sprintf('Database "%s" does not exist.', $name));
     }
 
     /**
@@ -115,7 +115,7 @@ public function getNames()
     /**
      * Executes the shutdown procedure.
      *
-     * @throws sfDatabaseException If an error occurs while shutting down this DatabaseManager
+     * @throws \sfDatabaseException If an error occurs while shutting down this DatabaseManager
      */
     public function shutdown()
     {
diff --git a/lib/database/sfMySQLDatabase.class.php b/lib/database/sfMySQLDatabase.class.php
index 82e5d8248..10f317ff3 100644
--- a/lib/database/sfMySQLDatabase.class.php
+++ b/lib/database/sfMySQLDatabase.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,12 +25,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfMySQLDatabase extends sfDatabase
+class sfMySQLDatabase extends \sfDatabase
 {
     /**
      * Connects to the database.
      *
-     * @throws sfDatabaseException If a connection could not be created
+     * @throws \sfDatabaseException If a connection could not be created
      */
     public function connect()
     {
@@ -55,13 +55,13 @@ public function connect()
         // make sure the connection went through
         if (false === $this->connection) {
             // the connection's foobar'd
-            throw new sfDatabaseException('Failed to create a MySQLDatabase connection.');
+            throw new \sfDatabaseException('Failed to create a MySQLDatabase connection.');
         }
 
         // select our database
         if ($this->selectDatabase($database)) {
             // can't select the database
-            throw new sfDatabaseException(sprintf('Failed to select MySQLDatabase "%s".', $database));
+            throw new \sfDatabaseException(sprintf('Failed to select MySQLDatabase "%s".', $database));
         }
 
         // set encoding if specified
@@ -77,7 +77,7 @@ public function connect()
     /**
      * Execute the shutdown procedure.
      *
-     * @throws sfDatabaseException If an error occurs while shutting down this database
+     * @throws \sfDatabaseException If an error occurs while shutting down this database
      */
     public function shutdown()
     {
diff --git a/lib/database/sfMySQLiDatabase.class.php b/lib/database/sfMySQLiDatabase.class.php
index a7c485c39..54aa83577 100644
--- a/lib/database/sfMySQLiDatabase.class.php
+++ b/lib/database/sfMySQLiDatabase.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,14 +12,14 @@
 /**
  * sfMySQLiDatabase provides connectivity for the MySQL brand database.
  *
- * @see sfMySQLDatabase
+ * @see \sfMySQLDatabase
  *
  * @property $connection mysqli
  */
-class sfMySQLiDatabase extends sfMySQLDatabase
+class sfMySQLiDatabase extends \sfMySQLDatabase
 {
     /**
-     * @throws sfDatabaseException
+     * @throws \sfDatabaseException
      */
     public function connect()
     {
@@ -32,7 +32,7 @@ public function connect()
     /**
      * Execute the shutdown procedure.
      *
-     * @throws sfDatabaseException If an error occurs while shutting down this database
+     * @throws \sfDatabaseException If an error occurs while shutting down this database
      */
     public function shutdown()
     {
diff --git a/lib/database/sfPDODatabase.class.php b/lib/database/sfPDODatabase.class.php
index d81999960..c9043d7dd 100644
--- a/lib/database/sfPDODatabase.class.php
+++ b/lib/database/sfPDODatabase.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfPDODatabase extends sfDatabase
+class sfPDODatabase extends \sfDatabase
 {
     /**
      * Magic method for calling PDO directly via sfPDODatabase.
@@ -29,19 +29,19 @@ class sfPDODatabase extends sfDatabase
      */
     public function __call($method, $arguments)
     {
-        return call_user_func_array(array($this->getConnection(), $method), $arguments);
+        return call_user_func_array([$this->getConnection(), $method], $arguments);
     }
 
     /**
      * Connects to the database.
      *
-     * @throws sfDatabaseException If a connection could not be created
+     * @throws \sfDatabaseException If a connection could not be created
      */
     public function connect()
     {
         if (!$dsn = $this->getParameter('dsn')) {
             // missing required dsn parameter
-            throw new sfDatabaseException('Database configuration is missing the "dsn" parameter.');
+            throw new \sfDatabaseException('Database configuration is missing the "dsn" parameter.');
         }
 
         try {
@@ -50,36 +50,36 @@ public function connect()
             $password = $this->getParameter('password');
             $persistent = $this->getParameter('persistent');
 
-            $options = $persistent ? array(PDO::ATTR_PERSISTENT => true) : array();
+            $options = $persistent ? [\PDO::ATTR_PERSISTENT => true] : [];
 
             $this->connection = new $pdo_class($dsn, $username, $password, $options);
-        } catch (PDOException $e) {
-            throw new sfDatabaseException($e->getMessage());
+        } catch (\PDOException $e) {
+            throw new \sfDatabaseException($e->getMessage());
         }
 
         // lets generate exceptions instead of silent failures
-        if (sfConfig::get('sf_debug')) {
-            $this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        if (\sfConfig::get('sf_debug')) {
+            $this->connection->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
         } else {
-            $this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+            $this->connection->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
         }
 
         // compatability
         $compatability = $this->getParameter('compat');
         if ($compatability) {
-            $this->connection->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
+            $this->connection->setAttribute(\PDO::ATTR_CASE, \PDO::CASE_NATURAL);
         }
 
         // nulls
         $nulls = $this->getParameter('nulls');
         if ($nulls) {
-            $this->connection->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
+            $this->connection->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
         }
 
         // auto commit
         $autocommit = $this->getParameter('autocommit');
         if ($autocommit) {
-            $this->connection->setAttribute(PDO::ATTR_AUTOCOMMIT, true);
+            $this->connection->setAttribute(\PDO::ATTR_AUTOCOMMIT, true);
         }
 
         $this->resource = $this->connection;
diff --git a/lib/database/sfPostgreSQLDatabase.class.php b/lib/database/sfPostgreSQLDatabase.class.php
index d5ed1dcbc..53194468d 100644
--- a/lib/database/sfPostgreSQLDatabase.class.php
+++ b/lib/database/sfPostgreSQLDatabase.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,12 +26,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfPostgreSQLDatabase extends sfDatabase
+class sfPostgreSQLDatabase extends \sfDatabase
 {
     /**
      * Connects to the database.
      *
-     * @throws sfDatabaseException If a connection could not be created
+     * @throws \sfDatabaseException If a connection could not be created
      */
     public function connect()
     {
@@ -57,7 +57,7 @@ public function connect()
         // make sure the connection went through
         if (false === $this->connection) {
             // the connection's foobar'd
-            throw new sfDatabaseException('Failed to create a PostgreSQLDatabase connection.');
+            throw new \sfDatabaseException('Failed to create a PostgreSQLDatabase connection.');
         }
 
         // since we're not an abstraction layer, we copy the connection
@@ -68,7 +68,7 @@ public function connect()
     /**
      * Executes the shutdown procedure.
      *
-     * @throws sfDatabaseException If an error occurs while shutting down this database
+     * @throws \sfDatabaseException If an error occurs while shutting down this database
      */
     public function shutdown()
     {
diff --git a/lib/debug/sfDebug.class.php b/lib/debug/sfDebug.class.php
index db1fe186a..dad90d6b7 100644
--- a/lib/debug/sfDebug.class.php
+++ b/lib/debug/sfDebug.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,10 +25,10 @@ class sfDebug
      */
     public static function symfonyInfoAsArray()
     {
-        return array(
+        return [
             'version' => SYMFONY_VERSION,
-            'path' => sfConfig::get('sf_symfony_lib_dir'),
-        );
+            'path' => \sfConfig::get('sf_symfony_lib_dir'),
+        ];
     }
 
     /**
@@ -37,11 +38,11 @@ public static function symfonyInfoAsArray()
      */
     public static function phpInfoAsArray()
     {
-        $values = array(
+        $values = [
             'php' => phpversion(),
             'os' => php_uname(),
             'extensions' => get_loaded_extensions(),
-        );
+        ];
 
         natcasesort($values['extensions']);
 
@@ -62,13 +63,13 @@ public static function phpInfoAsArray()
      */
     public static function globalsAsArray()
     {
-        $values = array();
-        foreach (array('cookie', 'server', 'get', 'post', 'files', 'env', 'session') as $name) {
+        $values = [];
+        foreach (['cookie', 'server', 'get', 'post', 'files', 'env', 'session'] as $name) {
             if (!isset($GLOBALS['_'.strtoupper($name)])) {
                 continue;
             }
 
-            $values[$name] = array();
+            $values[$name] = [];
             foreach ($GLOBALS['_'.strtoupper($name)] as $key => $value) {
                 $values[$name][$key] = $value;
             }
@@ -87,7 +88,7 @@ public static function globalsAsArray()
      */
     public static function settingsAsArray()
     {
-        $config = sfConfig::getAll();
+        $config = \sfConfig::getAll();
 
         ksort($config);
 
@@ -97,73 +98,73 @@ public static function settingsAsArray()
     /**
      * Returns request parameter holders as an array.
      *
-     * @param sfRequest $request A sfRequest instance
+     * @param \sfRequest $request A sfRequest instance
      *
      * @return array The request parameter holders
      */
-    public static function requestAsArray(sfRequest $request = null)
+    public static function requestAsArray(\sfRequest $request = null)
     {
         if (!$request) {
-            return array();
+            return [];
         }
 
-        return array(
+        return [
             'options' => $request->getOptions(),
             'parameterHolder' => self::flattenParameterHolder($request->getParameterHolder(), true),
             'attributeHolder' => self::flattenParameterHolder($request->getAttributeHolder(), true),
-        );
+        ];
     }
 
     /**
      * Returns response parameters as an array.
      *
-     * @param sfWebResponse $response A sfResponse instance
+     * @param \sfWebResponse $response A sfResponse instance
      *
      * @return array The response parameters
      */
-    public static function responseAsArray(sfResponse $response = null)
+    public static function responseAsArray(\sfResponse $response = null)
     {
         if (!$response) {
-            return array();
+            return [];
         }
 
-        return array(
-            'status' => array('code' => $response->getStatusCode(), 'text' => $response->getStatusText()),
+        return [
+            'status' => ['code' => $response->getStatusCode(), 'text' => $response->getStatusText()],
             'options' => $response->getOptions(),
-            'cookies' => method_exists($response, 'getCookies') ? $response->getCookies() : array(),
-            'httpHeaders' => method_exists($response, 'getHttpHeaders') ? $response->getHttpHeaders() : array(),
-            'javascripts' => method_exists($response, 'getJavascripts') ? $response->getJavascripts('ALL') : array(),
-            'stylesheets' => method_exists($response, 'getStylesheets') ? $response->getStylesheets('ALL') : array(),
-            'metas' => method_exists($response, 'getMetas') ? $response->getMetas() : array(),
-            'httpMetas' => method_exists($response, 'getHttpMetas') ? $response->getHttpMetas() : array(),
-        );
+            'cookies' => method_exists($response, 'getCookies') ? $response->getCookies() : [],
+            'httpHeaders' => method_exists($response, 'getHttpHeaders') ? $response->getHttpHeaders() : [],
+            'javascripts' => method_exists($response, 'getJavascripts') ? $response->getJavascripts('ALL') : [],
+            'stylesheets' => method_exists($response, 'getStylesheets') ? $response->getStylesheets('ALL') : [],
+            'metas' => method_exists($response, 'getMetas') ? $response->getMetas() : [],
+            'httpMetas' => method_exists($response, 'getHttpMetas') ? $response->getHttpMetas() : [],
+        ];
     }
 
     /**
      * Returns user parameters as an array.
      *
-     * @param sfUser $user A sfUser instance
+     * @param \sfUser $user A sfUser instance
      *
      * @return array The user parameters
      */
-    public static function userAsArray(sfUser $user = null)
+    public static function userAsArray(\sfUser $user = null)
     {
         if (!$user) {
-            return array();
+            return [];
         }
 
-        $data = array(
+        $data = [
             'options' => $user->getOptions(),
             'attributeHolder' => self::flattenParameterHolder($user->getAttributeHolder(), true),
             'culture' => $user->getCulture(),
-        );
+        ];
 
-        if ($user instanceof sfBasicSecurityUser) {
-            $data = array_merge($data, array(
+        if ($user instanceof \sfBasicSecurityUser) {
+            $data = array_merge($data, [
                 'authenticated' => $user->isAuthenticated(),
                 'credentials' => $user->getCredentials(),
                 'lastRequest' => $user->getLastRequestTime(),
-            ));
+            ]);
         }
 
         return $data;
@@ -172,17 +173,17 @@ public static function userAsArray(sfUser $user = null)
     /**
      * Returns a parameter holder as an array.
      *
-     * @param sfParameterHolder $parameterHolder A sfParameterHolder instance
-     * @param bool              $removeObjects   when set to true, objects are removed. default is false for BC.
+     * @param \sfParameterHolder $parameterHolder A sfParameterHolder instance
+     * @param bool               $removeObjects   when set to true, objects are removed. default is false for BC.
      *
      * @return array The parameter holder as an array
      */
     public static function flattenParameterHolder($parameterHolder, $removeObjects = false)
     {
-        $values = array();
-        if ($parameterHolder instanceof sfNamespacedParameterHolder) {
+        $values = [];
+        if ($parameterHolder instanceof \sfNamespacedParameterHolder) {
             foreach ($parameterHolder->getNamespaces() as $ns) {
-                $values[$ns] = array();
+                $values[$ns] = [];
                 foreach ($parameterHolder->getAll($ns) as $key => $value) {
                     $values[$ns][$key] = $value;
                 }
@@ -212,7 +213,7 @@ public static function flattenParameterHolder($parameterHolder, $removeObjects =
      */
     public static function removeObjects($values)
     {
-        $nvalues = array();
+        $nvalues = [];
         foreach ($values as $key => $value) {
             if (is_array($value)) {
                 $nvalues[$key] = self::removeObjects($value);
@@ -239,8 +240,8 @@ public static function shortenFilePath($file)
             return $file;
         }
 
-        foreach (array('sf_root_dir', 'sf_symfony_lib_dir') as $key) {
-            if (0 === strpos($file, $value = sfConfig::get($key))) {
+        foreach (['sf_root_dir', 'sf_symfony_lib_dir'] as $key) {
+            if (str_starts_with($file, $value = \sfConfig::get($key))) {
                 $file = str_replace($value, strtoupper($key), $file);
 
                 break;
diff --git a/lib/debug/sfTimer.class.php b/lib/debug/sfTimer.class.php
index 8b85e0e9a..5f5abcea2 100644
--- a/lib/debug/sfTimer.class.php
+++ b/lib/debug/sfTimer.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/debug/sfTimerManager.class.php b/lib/debug/sfTimerManager.class.php
index 110939ca8..dce2fb681 100644
--- a/lib/debug/sfTimerManager.class.php
+++ b/lib/debug/sfTimerManager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +19,7 @@
 class sfTimerManager
 {
     /** @var sfTimer[] */
-    public static $timers = array();
+    public static $timers = [];
 
     /**
      * Gets a sfTimer instance.
@@ -28,12 +29,12 @@ class sfTimerManager
      * @param string $name  The name of the timer
      * @param bool   $reset
      *
-     * @return sfTimer The timer instance
+     * @return \sfTimer The timer instance
      */
     public static function getTimer($name, $reset = true)
     {
         if (!isset(self::$timers[$name])) {
-            self::$timers[$name] = new sfTimer($name);
+            self::$timers[$name] = new \sfTimer($name);
         }
 
         if ($reset) {
@@ -58,6 +59,6 @@ public static function getTimers()
      */
     public static function clearTimers()
     {
-        self::$timers = array();
+        self::$timers = [];
     }
 }
diff --git a/lib/debug/sfWebDebug.class.php b/lib/debug/sfWebDebug.class.php
index c7dd17415..51c63fc33 100644
--- a/lib/debug/sfWebDebug.class.php
+++ b/lib/debug/sfWebDebug.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,8 +20,8 @@ class sfWebDebug
 {
     protected $dispatcher;
     protected $logger;
-    protected $options = array();
-    protected $panels = array();
+    protected $options = [];
+    protected $panels = [];
 
     /**
      * Constructor.
@@ -30,11 +31,11 @@ class sfWebDebug
      *  * image_root_path:    The image root path
      *  * request_parameters: The current request parameters
      *
-     * @param sfEventDispatcher $dispatcher The event dispatcher
-     * @param sfVarLogger       $logger     The logger
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher The event dispatcher
+     * @param \sfVarLogger       $logger     The logger
+     * @param array              $options    An array of options
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfVarLogger $logger, array $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, \sfVarLogger $logger, array $options = [])
     {
         $this->dispatcher = $dispatcher;
         $this->logger = $logger;
@@ -45,12 +46,12 @@ public function __construct(sfEventDispatcher $dispatcher, sfVarLogger $logger,
         }
 
         if (!isset($this->options['request_parameters'])) {
-            $this->options['request_parameters'] = array();
+            $this->options['request_parameters'] = [];
         }
 
         $this->configure();
 
-        $this->dispatcher->notify(new sfEvent($this, 'debug.web.load_panels'));
+        $this->dispatcher->notify(new \sfEvent($this, 'debug.web.load_panels'));
     }
 
     /**
@@ -58,27 +59,27 @@ public function __construct(sfEventDispatcher $dispatcher, sfVarLogger $logger,
      */
     public function configure()
     {
-        $this->setPanel('symfony_version', new sfWebDebugPanelSymfonyVersion($this));
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_cache')) {
-            $this->setPanel('cache', new sfWebDebugPanelCache($this));
+        $this->setPanel('symfony_version', new \sfWebDebugPanelSymfonyVersion($this));
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_cache')) {
+            $this->setPanel('cache', new \sfWebDebugPanelCache($this));
         }
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->setPanel('config', new sfWebDebugPanelConfig($this));
-            $this->setPanel('view', new sfWebDebugPanelView($this));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->setPanel('config', new \sfWebDebugPanelConfig($this));
+            $this->setPanel('view', new \sfWebDebugPanelView($this));
         }
-        $this->setPanel('logs', new sfWebDebugPanelLogs($this));
-        $this->setPanel('memory', new sfWebDebugPanelMemory($this));
-        if (sfConfig::get('sf_debug')) {
-            $this->setPanel('time', new sfWebDebugPanelTimer($this));
+        $this->setPanel('logs', new \sfWebDebugPanelLogs($this));
+        $this->setPanel('memory', new \sfWebDebugPanelMemory($this));
+        if (\sfConfig::get('sf_debug')) {
+            $this->setPanel('time', new \sfWebDebugPanelTimer($this));
         }
 
-        $this->setPanel('mailer', new sfWebDebugPanelMailer($this));
+        $this->setPanel('mailer', new \sfWebDebugPanelMailer($this));
     }
 
     /**
      * Gets the logger.
      *
-     * @return sfVarLogger The logger instance
+     * @return \sfVarLogger The logger instance
      */
     public function getLogger()
     {
@@ -88,7 +89,7 @@ public function getLogger()
     /**
      * Gets the event dispatcher.
      *
-     * @return sfEventDispatcher The event dispatcher
+     * @return \sfEventDispatcher The event dispatcher
      */
     public function getEventDispatcher()
     {
@@ -108,10 +109,10 @@ public function getPanels()
     /**
      * Sets a panel by name.
      *
-     * @param string          $name  The panel name
-     * @param sfWebDebugPanel $panel The panel
+     * @param string           $name  The panel name
+     * @param \sfWebDebugPanel $panel The panel
      */
-    public function setPanel($name, sfWebDebugPanel $panel)
+    public function setPanel($name, \sfWebDebugPanel $panel)
     {
         $this->panels[$name] = $panel;
     }
@@ -129,8 +130,8 @@ public function removePanel($name)
     /**
      * Gets an option value by name.
      *
-     * @param string     $name    The option name
-     * @param mixed|null $default
+     * @param string      $name    The option name
+     * @param \mixed|null $default
      *
      * @return mixed The option value
      */
@@ -159,7 +160,7 @@ public function injectToolbar($content)
         }
 
         if (false !== $pos = $posFunction($content, '</head>')) {
-            $styles = '<style type="text/css">'.str_replace(array("\r", "\n"), ' ', $this->getStylesheet()).'</style>';
+            $styles = '<style type="text/css">'.str_replace(["\r", "\n"], ' ', $this->getStylesheet()).'</style>';
             $content = $substrFunction($content, 0, $pos).$styles.$substrFunction($content, $pos);
         }
 
@@ -182,8 +183,8 @@ public function asHtml()
     {
         $current = isset($this->options['request_parameters']['sfWebDebugPanel']) ? $this->options['request_parameters']['sfWebDebugPanel'] : null;
 
-        $titles = array();
-        $panels = array();
+        $titles = [];
+        $panels = [];
         foreach ($this->panels as $name => $panel) {
             if ($title = $panel->getTitle()) {
                 if (($content = $panel->getPanelContent()) || $panel->getTitleUrl()) {
@@ -236,10 +237,10 @@ public function asHtml()
      */
     public function getPriority($value)
     {
-        if ($value >= sfLogger::INFO) {
+        if ($value >= \sfLogger::INFO) {
             return 'info';
         }
-        if ($value >= sfLogger::WARNING) {
+        if ($value >= \sfLogger::WARNING) {
             return 'warning';
         }
 
diff --git a/lib/debug/sfWebDebugPanel.class.php b/lib/debug/sfWebDebugPanel.class.php
index 61a8495e0..b4ed56760 100644
--- a/lib/debug/sfWebDebugPanel.class.php
+++ b/lib/debug/sfWebDebugPanel.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,14 +19,14 @@
 abstract class sfWebDebugPanel
 {
     protected $webDebug;
-    protected $status = sfLogger::INFO;
+    protected $status = \sfLogger::INFO;
 
     /**
      * Constructor.
      *
-     * @param sfWebDebug $webDebug The web debug toolbar instance
+     * @param \sfWebDebug $webDebug The web debug toolbar instance
      */
-    public function __construct(sfWebDebug $webDebug)
+    public function __construct(\sfWebDebug $webDebug)
     {
         $this->webDebug = $webDebug;
     }
@@ -117,7 +118,7 @@ public function getToggleableDebugStack($debugStack)
             $file = isset($trace['file']) ? $trace['file'] : null;
             $line = isset($trace['line']) ? $trace['line'] : null;
 
-            $isProjectFile = $file && 0 === strpos($file, sfConfig::get('sf_root_dir')) && !preg_match('/(cache|plugins|vendor)/', $file);
+            $isProjectFile = $file &&   str_starts_with($file, \sfConfig::get('sf_root_dir')) && !preg_match('/(cache|plugins|vendor)/', $file);
 
             $html .= sprintf('<span%s>#%s &raquo; ', $isProjectFile ? ' class="sfWebDebugHighlight"' : '', $keys[$j] + 1);
 
@@ -150,24 +151,24 @@ public function getToggleableDebugStack($debugStack)
     public function formatFileLink($file, $line = null, $text = null)
     {
         // this method is called a lot so we avoid calling class_exists()
-        if ($file && !sfToolkit::isPathAbsolute($file)) {
+        if ($file && !\sfToolkit::isPathAbsolute($file)) {
             if (null === $text) {
                 $text = $file;
             }
 
             // translate class to file name
-            $r = new ReflectionClass($file);
+            $r = new \ReflectionClass($file);
             $file = $r->getFileName();
         }
 
-        $shortFile = sfDebug::shortenFilePath($file);
+        $shortFile = \sfDebug::shortenFilePath($file);
 
-        if ($linkFormat = sfConfig::get('sf_file_link_format', ini_get('xdebug.file_link_format'))) {
+        if ($linkFormat = \sfConfig::get('sf_file_link_format', ini_get('xdebug.file_link_format'))) {
             // return a link
             return sprintf(
                 '<a href="%s" class="sfWebDebugFileLink" title="%s">%s</a>',
-                htmlspecialchars(strtr($linkFormat, array('%f' => $file, '%l' => $line)), ENT_QUOTES, sfConfig::get('sf_charset')),
-                htmlspecialchars($shortFile, ENT_QUOTES, sfConfig::get('sf_charset')),
+                htmlspecialchars(strtr($linkFormat, ['%f' => $file, '%l' => $line]), ENT_QUOTES, \sfConfig::get('sf_charset')),
+                htmlspecialchars($shortFile, ENT_QUOTES, \sfConfig::get('sf_charset')),
                 null === $text ? $shortFile : $text
             );
         }
diff --git a/lib/debug/sfWebDebugPanelCache.class.php b/lib/debug/sfWebDebugPanelCache.class.php
index ba8fb9805..f00078c6f 100644
--- a/lib/debug/sfWebDebugPanelCache.class.php
+++ b/lib/debug/sfWebDebugPanelCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelCache extends sfWebDebugPanel
+class sfWebDebugPanelCache extends \sfWebDebugPanel
 {
     public function getTitle()
     {
@@ -27,7 +28,7 @@ public function getTitleUrl()
     {
         $queryString = parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY);
 
-        if (false === strpos($queryString, '_sf_ignore_cache')) {
+        if (!str_contains($queryString, '_sf_ignore_cache')) {
             return sprintf('?%s_sf_ignore_cache=1', $queryString ? $queryString.'&' : '');
         }
 
diff --git a/lib/debug/sfWebDebugPanelConfig.class.php b/lib/debug/sfWebDebugPanelConfig.class.php
index c0bee63e4..c4688ce1f 100644
--- a/lib/debug/sfWebDebugPanelConfig.class.php
+++ b/lib/debug/sfWebDebugPanelConfig.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelConfig extends sfWebDebugPanel
+class sfWebDebugPanelConfig extends \sfWebDebugPanel
 {
     public function getTitle()
     {
@@ -29,17 +30,17 @@ public function getPanelTitle()
 
     public function getPanelContent()
     {
-        $config = array(
-            'debug' => sfConfig::get('sf_debug') ? 'on' : 'off',
+        $config = [
+            'debug' => \sfConfig::get('sf_debug') ? 'on' : 'off',
             'xdebug' => extension_loaded('xdebug') ? 'on' : 'off',
-            'logging' => sfConfig::get('sf_logging_enabled') ? 'on' : 'off',
-            'cache' => sfConfig::get('sf_cache') ? 'on' : 'off',
-            'compression' => sfConfig::get('sf_compressed') ? 'on' : 'off',
+            'logging' => \sfConfig::get('sf_logging_enabled') ? 'on' : 'off',
+            'cache' => \sfConfig::get('sf_cache') ? 'on' : 'off',
+            'compression' => \sfConfig::get('sf_compressed') ? 'on' : 'off',
             'tokenizer' => function_exists('token_get_all') ? 'on' : 'off',
             'eaccelerator' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable') ? 'on' : 'off',
             'apc' => extension_loaded('apc') && ini_get('apc.enabled') ? 'on' : 'off',
             'xcache' => extension_loaded('xcache') && ini_get('xcache.cacher') ? 'on' : 'off',
-        );
+        ];
 
         $html = '<ul id="sfWebDebugConfigSummary">';
         foreach ($config as $key => $value) {
@@ -47,14 +48,14 @@ public function getPanelContent()
         }
         $html .= '</ul>';
 
-        $context = sfContext::getInstance();
-        $html .= $this->formatArrayAsHtml('request', sfDebug::requestAsArray($context->getRequest()));
-        $html .= $this->formatArrayAsHtml('response', sfDebug::responseAsArray($context->getResponse()));
-        $html .= $this->formatArrayAsHtml('user', sfDebug::userAsArray($context->getUser()));
-        $html .= $this->formatArrayAsHtml('settings', sfDebug::settingsAsArray());
-        $html .= $this->formatArrayAsHtml('globals', sfDebug::globalsAsArray());
-        $html .= $this->formatArrayAsHtml('php', sfDebug::phpInfoAsArray());
-        $html .= $this->formatArrayAsHtml('symfony', sfDebug::symfonyInfoAsArray());
+        $context = \sfContext::getInstance();
+        $html .= $this->formatArrayAsHtml('request', \sfDebug::requestAsArray($context->getRequest()));
+        $html .= $this->formatArrayAsHtml('response', \sfDebug::responseAsArray($context->getResponse()));
+        $html .= $this->formatArrayAsHtml('user', \sfDebug::userAsArray($context->getUser()));
+        $html .= $this->formatArrayAsHtml('settings', \sfDebug::settingsAsArray());
+        $html .= $this->formatArrayAsHtml('globals', \sfDebug::globalsAsArray());
+        $html .= $this->formatArrayAsHtml('php', \sfDebug::phpInfoAsArray());
+        $html .= $this->formatArrayAsHtml('symfony', \sfDebug::symfonyInfoAsArray());
 
         return $html;
     }
@@ -73,7 +74,7 @@ protected function formatArrayAsHtml($id, $values)
 
         return '
     <h2>'.$id.' '.$this->getToggler('sfWebDebug'.$id).'</h2>
-    <div id="sfWebDebug'.$id.'" style="display: none"><pre>'.htmlspecialchars(sfYaml::dump(sfDebug::removeObjects($values)), ENT_QUOTES, sfConfig::get('sf_charset')).'</pre></div>
+    <div id="sfWebDebug'.$id.'" style="display: none"><pre>'.htmlspecialchars(\sfYaml::dump(\sfDebug::removeObjects($values)), ENT_QUOTES, \sfConfig::get('sf_charset')).'</pre></div>
     ';
     }
 }
diff --git a/lib/debug/sfWebDebugPanelLogs.class.php b/lib/debug/sfWebDebugPanelLogs.class.php
index 58802582c..fe489c451 100644
--- a/lib/debug/sfWebDebugPanelLogs.class.php
+++ b/lib/debug/sfWebDebugPanelLogs.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelLogs extends sfWebDebugPanel
+class sfWebDebugPanelLogs extends \sfWebDebugPanel
 {
     public function getTitle()
     {
@@ -29,7 +30,7 @@ public function getPanelTitle()
 
     public function getPanelContent()
     {
-        $event = $this->webDebug->getEventDispatcher()->filter(new sfEvent($this, 'debug.web.filter_logs'), $this->webDebug->getLogger()->getLogs());
+        $event = $this->webDebug->getEventDispatcher()->filter(new \sfEvent($this, 'debug.web.filter_logs'), $this->webDebug->getLogger()->getLogs());
         $logs = $event->getReturnValue();
 
         $html = '<table class="sfWebDebugLogs">
@@ -61,7 +62,7 @@ class_exists($log['type'], false) ? $this->formatFileLink($log['type']) : $log['
         }
         $html .= '</table>';
 
-        $types = array();
+        $types = [];
         foreach ($this->webDebug->getLogger()->getTypes() as $type) {
             $types[] = '<a href="#" onclick="sfWebDebugToggleMessages(\''.$type.'\'); return false;">'.$type.'</a>';
         }
@@ -91,26 +92,26 @@ protected function formatLogLine($logLine)
         static $constants;
 
         if (!$constants) {
-            foreach (array('sf_app_dir', 'sf_root_dir', 'sf_symfony_lib_dir') as $constant) {
-                $constants[realpath(sfConfig::get($constant)).DIRECTORY_SEPARATOR] = $constant.DIRECTORY_SEPARATOR;
+            foreach (['sf_app_dir', 'sf_root_dir', 'sf_symfony_lib_dir'] as $constant) {
+                $constants[realpath(\sfConfig::get($constant)).DIRECTORY_SEPARATOR] = $constant.DIRECTORY_SEPARATOR;
             }
         }
 
         // escape HTML
-        $logLine = htmlspecialchars($logLine, ENT_QUOTES, sfConfig::get('sf_charset'));
+        $logLine = htmlspecialchars($logLine, ENT_QUOTES, \sfConfig::get('sf_charset'));
 
         // replace constants value with constant name
         $logLine = str_replace(array_keys($constants), array_values($constants), $logLine);
 
-        $logLine = sfToolkit::pregtr($logLine, array('/&quot;(.+?)&quot;/s' => '"<span class="sfWebDebugLogInfo">\\1</span>"',
+        $logLine = \sfToolkit::pregtr($logLine, ['/&quot;(.+?)&quot;/s' => '"<span class="sfWebDebugLogInfo">\\1</span>"',
             '/^(.+?)\(\)\:/S' => '<span class="sfWebDebugLogInfo">\\1()</span>:',
-            '/line (\d+)$/' => 'line <span class="sfWebDebugLogInfo">\\1</span>'));
+            '/line (\d+)$/' => 'line <span class="sfWebDebugLogInfo">\\1</span>']);
 
         // special formatting for SQL lines
         $logLine = $this->formatSql($logLine);
 
         // remove username/password from DSN
-        if (false !== strpos($logLine, 'DSN')) {
+        if (str_contains($logLine, 'DSN')) {
             $logLine = preg_replace("/=&gt;\\s+'?[^'\\s,]+'?/", "=&gt; '****'", $logLine);
         }
 
diff --git a/lib/debug/sfWebDebugPanelMailer.class.php b/lib/debug/sfWebDebugPanelMailer.class.php
index ab31b24be..afddaa5b3 100644
--- a/lib/debug/sfWebDebugPanelMailer.class.php
+++ b/lib/debug/sfWebDebugPanelMailer.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,21 +16,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelMailer extends sfWebDebugPanel
+class sfWebDebugPanelMailer extends \sfWebDebugPanel
 {
-    /** @var sfMailer */
+    /** @var \sfMailer */
     protected $mailer;
 
     /**
      * Constructor.
      *
-     * @param sfWebDebug $webDebug The web debug toolbar instance
+     * @param \sfWebDebug $webDebug The web debug toolbar instance
      */
-    public function __construct(sfWebDebug $webDebug)
+    public function __construct(\sfWebDebug $webDebug)
     {
         parent::__construct($webDebug);
 
-        $this->webDebug->getEventDispatcher()->connect('mailer.configure', array($this, 'listenForMailerConfigure'));
+        $this->webDebug->getEventDispatcher()->connect('mailer.configure', [$this, 'listenForMailerConfigure']);
     }
 
     public function getTitle()
@@ -52,14 +53,14 @@ public function getPanelContent()
             return false;
         }
 
-        $html = array();
+        $html = [];
 
         // configuration information
         $strategy = $this->mailer->getDeliveryStrategy();
         $html[] = '<h2>Configuration</h2>';
         $html[] = '<em>Delivery strategy</em>: '.$strategy;
 
-        if (sfMailer::SINGLE_ADDRESS == $strategy) {
+        if (\sfMailer::SINGLE_ADDRESS == $strategy) {
             $html[] = ' - <em>all emails are delivered to</em>: '.$this->mailer->getDeliveryAddress();
         }
 
@@ -75,12 +76,12 @@ public function getPanelContent()
     /**
      * Listens for the mailer.configure event and captures a reference to the mailer.
      */
-    public function listenForMailerConfigure(sfEvent $event)
+    public function listenForMailerConfigure(\sfEvent $event)
     {
         $this->mailer = $event->getSubject();
     }
 
-    protected function renderMessageInformation(Swift_Message $message)
+    protected function renderMessageInformation(\Swift_Message $message)
     {
         static $i = 0;
 
@@ -88,7 +89,7 @@ protected function renderMessageInformation(Swift_Message $message)
 
         $to = null === $message->getTo() ? '' : implode(', ', array_keys($message->getTo()));
 
-        $html = array();
+        $html = [];
         $html[] = sprintf('<h3>%s (to: %s) %s</h3>', $message->getSubject(), $to, $this->getToggler('sfWebDebugMailTemplate'.$i));
         $html[] = '<div id="sfWebDebugMailTemplate'.$i.'" style="display:'.(1 == $i ? 'block' : 'none').'">';
         $html[] = '<pre>'.htmlentities($message->toString(), ENT_QUOTES, $message->getCharset()).'</pre>';
diff --git a/lib/debug/sfWebDebugPanelMemory.class.php b/lib/debug/sfWebDebugPanelMemory.class.php
index dc1ffe2b9..28bcf316d 100644
--- a/lib/debug/sfWebDebugPanelMemory.class.php
+++ b/lib/debug/sfWebDebugPanelMemory.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelMemory extends sfWebDebugPanel
+class sfWebDebugPanelMemory extends \sfWebDebugPanel
 {
     public function getTitle()
     {
diff --git a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
index e97bbd8ee..47ccbd6d9 100644
--- a/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
+++ b/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelSymfonyVersion extends sfWebDebugPanel
+class sfWebDebugPanelSymfonyVersion extends \sfWebDebugPanel
 {
     public function getTitle()
     {
diff --git a/lib/debug/sfWebDebugPanelTimer.class.php b/lib/debug/sfWebDebugPanelTimer.class.php
index dc932edc5..c95271156 100644
--- a/lib/debug/sfWebDebugPanelTimer.class.php
+++ b/lib/debug/sfWebDebugPanelTimer.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,20 +16,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelTimer extends sfWebDebugPanel
+class sfWebDebugPanelTimer extends \sfWebDebugPanel
 {
     protected static $startTime;
 
     /**
      * Constructor.
      *
-     * @param sfWebDebug $webDebug The web debug toolbar instance
+     * @param \sfWebDebug $webDebug The web debug toolbar instance
      */
-    public function __construct(sfWebDebug $webDebug)
+    public function __construct(\sfWebDebug $webDebug)
     {
         parent::__construct($webDebug);
 
-        $this->webDebug->getEventDispatcher()->connect('debug.web.filter_logs', array($this, 'filterLogs'));
+        $this->webDebug->getEventDispatcher()->connect('debug.web.filter_logs', [$this, 'filterLogs']);
     }
 
     public function getTitle()
@@ -43,10 +44,10 @@ public function getPanelTitle()
 
     public function getPanelContent()
     {
-        if (sfTimerManager::getTimers()) {
+        if (\sfTimerManager::getTimers()) {
             $totalTime = $this->getTotalTime();
             $panel = '<table class="sfWebDebugLogs" style="width: 300px"><tr><th>type</th><th>calls</th><th>time (ms)</th><th>time (%)</th></tr>';
-            foreach (sfTimerManager::getTimers() as $name => $timer) {
+            foreach (\sfTimerManager::getTimers() as $name => $timer) {
                 $panel .= sprintf('<tr><td class="sfWebDebugLogType">%s</td><td class="sfWebDebugLogNumber" style="text-align: right">%d</td><td style="text-align: right">%.2f</td><td style="text-align: right">%d</td></tr>', $name, $timer->getCalls(), $timer->getElapsedTime() * 1000, $totalTime ? ($timer->getElapsedTime() * 1000 * 100 / $totalTime) : 'N/A');
             }
             $panel .= '</table>';
@@ -55,9 +56,9 @@ public function getPanelContent()
         }
     }
 
-    public function filterLogs(sfEvent $event, $logs)
+    public function filterLogs(\sfEvent $event, $logs)
     {
-        $newLogs = array();
+        $newLogs = [];
         foreach ($logs as $log) {
             if ('sfWebDebugLogger' != $log['type']) {
                 $newLogs[] = $log;
diff --git a/lib/debug/sfWebDebugPanelView.class.php b/lib/debug/sfWebDebugPanelView.class.php
index 7072ea25a..c72b5d6f5 100644
--- a/lib/debug/sfWebDebugPanelView.class.php
+++ b/lib/debug/sfWebDebugPanelView.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,31 +16,31 @@
  *
  * @version     SVN: $Id$
  */
-class sfWebDebugPanelView extends sfWebDebugPanel
+class sfWebDebugPanelView extends \sfWebDebugPanel
 {
-    protected $actions = array();
-    protected $partials = array();
+    protected $actions = [];
+    protected $partials = [];
 
     /**
      * Constructor.
      *
-     * @param sfWebDebug $webDebug The web debug toolbar instance
+     * @param \sfWebDebug $webDebug The web debug toolbar instance
      */
-    public function __construct(sfWebDebug $webDebug)
+    public function __construct(\sfWebDebug $webDebug)
     {
         parent::__construct($webDebug);
 
-        $this->webDebug->getEventDispatcher()->connect('controller.change_action', array($this, 'listenForChangeAction'));
-        $this->webDebug->getEventDispatcher()->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
+        $this->webDebug->getEventDispatcher()->connect('controller.change_action', [$this, 'listenForChangeAction']);
+        $this->webDebug->getEventDispatcher()->connect('template.filter_parameters', [$this, 'filterTemplateParameters']);
     }
 
     /**
      * Resets the parameter collections.
      */
-    public function listenForChangeAction(sfEvent $event)
+    public function listenForChangeAction(\sfEvent $event)
     {
-        $this->actions = array();
-        $this->partials = array();
+        $this->actions = [];
+        $this->partials = [];
     }
 
     /**
@@ -49,21 +50,21 @@ public function listenForChangeAction(sfEvent $event)
      *
      * @return array
      */
-    public function filterTemplateParameters(sfEvent $event, $parameters)
+    public function filterTemplateParameters(\sfEvent $event, $parameters)
     {
-        $entry = array('parameters' => $parameters);
+        $entry = ['parameters' => $parameters];
 
         if ('action' == $parameters['sf_type'] && $file = $this->getLastTemplate()) {
-            $this->actions[] = $entry + array('file' => $file);
+            $this->actions[] = $entry + ['file' => $file];
         } elseif ('partial' == $parameters['sf_type'] && $file = $this->getLastTemplate('sfPartialView')) {
-            $this->partials[] = $entry + array('file' => $file);
+            $this->partials[] = $entry + ['file' => $file];
         }
 
         return $parameters;
     }
 
     /**
-     * @see sfWebDebugPanel
+     * @see \sfWebDebugPanel
      */
     public function getTitle()
     {
@@ -73,7 +74,7 @@ public function getTitle()
     }
 
     /**
-     * @see sfWebDebugPanel
+     * @see \sfWebDebugPanel
      */
     public function getPanelTitle()
     {
@@ -81,11 +82,11 @@ public function getPanelTitle()
     }
 
     /**
-     * @see sfWebDebugPanel
+     * @see \sfWebDebugPanel
      */
     public function getPanelContent()
     {
-        $html = array();
+        $html = [];
 
         foreach ($this->actions as $action) {
             $html[] = $this->renderTemplateInformation($action['file'], $action['parameters']);
@@ -103,7 +104,7 @@ public function getPanelContent()
      *
      * @param string $class Name of the rendering view class
      *
-     * @return string|null
+     * @return \string|null
      */
     protected function getLastTemplate($class = 'sfPHPView')
     {
@@ -135,7 +136,7 @@ protected function renderTemplateInformation($file, $parameters, $label = 'Templ
         $parameters = $this->filterCoreParameters($parameters);
         ++$i;
 
-        $html = array();
+        $html = [];
         $html[] = sprintf('<h2>%s: %s %s</h2>', $label, $this->formatFileLink($file, null, $this->shortenTemplatePath($file)), $this->getToggler('sfWebDebugViewTemplate'.$i));
         $html[] = '<div id="sfWebDebugViewTemplate'.$i.'" style="display:'.(1 == $i ? 'block' : 'none').'">';
         if (count($parameters)) {
@@ -143,7 +144,7 @@ protected function renderTemplateInformation($file, $parameters, $label = 'Templ
             $html[] = '<ul>';
             foreach ($parameters as $name => $parameter) {
                 $presentation = '<li>'.$this->formatParameterAsHtml($name, $parameter).'</li>';
-                $html[] = $this->webDebug->getEventDispatcher()->filter(new sfEvent($this, 'debug.web.view.filter_parameter_html', array('parameter' => $parameter)), $presentation)->getReturnValue();
+                $html[] = $this->webDebug->getEventDispatcher()->filter(new \sfEvent($this, 'debug.web.view.filter_parameter_html', ['parameter' => $parameter]), $presentation)->getReturnValue();
             }
             $html[] = '</ul>';
         } else {
@@ -180,7 +181,7 @@ protected function formatParameterAsHtml($name, $parameter)
      */
     protected function formatObjectAsHtml($name, $parameter)
     {
-        if ($parameter instanceof sfForm) {
+        if ($parameter instanceof \sfForm) {
             return $this->formatFormAsHtml($name, $parameter);
         }
 
@@ -194,17 +195,17 @@ protected function formatObjectAsHtml($name, $parameter)
      *
      * @return string
      */
-    protected function formatFormAsHtml($name, sfForm $form)
+    protected function formatFormAsHtml($name, \sfForm $form)
     {
         static $i = 0;
 
         ++$i;
 
-        if ($form->hasErrors() && sfLogger::NOTICE < $this->getStatus()) {
-            $this->setStatus(sfLogger::NOTICE);
+        if ($form->hasErrors() && \sfLogger::NOTICE < $this->getStatus()) {
+            $this->setStatus(\sfLogger::NOTICE);
         }
 
-        $html = array();
+        $html = [];
         $html[] = $this->getParameterDescription($name, $form, $form->hasErrors() ? '<code class="sfWebDebugWarning">$%s</code>' : null);
         $html[] = $this->getToggler('sfWebDebugViewForm'.$i);
         $html[] = '<div id="sfWebDebugViewForm'.$i.'" style="display:none">';
@@ -226,13 +227,13 @@ protected function formatFormAsHtml($name, sfForm $form)
      *
      * @return string
      */
-    protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $nameFormat = '%s')
+    protected function formatFormFieldSchemaAsHtml(\sfFormFieldSchema $fieldSchema, $nameFormat = '%s')
     {
-        $html = array();
+        $html = [];
 
         foreach ($fieldSchema as $field) {
             $name = sprintf($nameFormat, $this->varExport($field->getName()));
-            if ($field instanceof sfFormFieldSchema) {
+            if ($field instanceof \sfFormFieldSchema) {
                 $html[] = $this->formatFormFieldSchemaAsHtml($field, $name.'[%s]');
             } else {
                 $html[] = '<li>';
@@ -252,9 +253,9 @@ protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $
     /**
      * Formats information about a parameter as HTML.
      *
-     * @param string     $name
-     * @param mixed|null $nameFormat
-     * @param mixed|null $typeFormat
+     * @param string      $name
+     * @param \mixed|null $nameFormat
+     * @param \mixed|null $typeFormat
      *
      * @return string
      */
@@ -288,7 +289,7 @@ protected function shortenTemplatePath($path)
             return $match[1].'&nbsp;&hellip;&nbsp;'.$match[2];
         }
 
-        return str_replace('SF_ROOT_DIR'.DIRECTORY_SEPARATOR, '', sfDebug::shortenFilePath($path));
+        return str_replace('SF_ROOT_DIR'.DIRECTORY_SEPARATOR, '', \sfDebug::shortenFilePath($path));
     }
 
     /**
@@ -300,10 +301,10 @@ protected function shortenTemplatePath($path)
      */
     protected function filterCoreParameters($parameters)
     {
-        $filtered = array();
+        $filtered = [];
 
         foreach ($parameters as $name => $value) {
-            if (0 !== strpos($name, 'sf_')) {
+            if (!str_starts_with($name, 'sf_')) {
                 $filtered[$name] = $value;
             }
         }
diff --git a/lib/escaper/sfOutputEscaper.class.php b/lib/escaper/sfOutputEscaper.class.php
index 58711724c..815c2d398 100644
--- a/lib/escaper/sfOutputEscaper.class.php
+++ b/lib/escaper/sfOutputEscaper.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -30,7 +31,7 @@ abstract class sfOutputEscaper
      */
     protected $escapingMethod;
 
-    protected static $safeClasses = array();
+    protected static $safeClasses = [];
 
     /**
      * Constructor stores the escaping method and value.
@@ -86,7 +87,7 @@ public function __get($var)
      *
      * @return mixed Escaping value
      *
-     * @throws InvalidArgumentException If the escaping fails
+     * @throws \InvalidArgumentException If the escaping fails
      */
     public static function escape($escapingMethod, $value)
     {
@@ -100,11 +101,11 @@ public static function escape($escapingMethod, $value)
         }
 
         if (is_array($value)) {
-            return new sfOutputEscaperArrayDecorator($escapingMethod, $value);
+            return new \sfOutputEscaperArrayDecorator($escapingMethod, $value);
         }
 
         if (is_object($value)) {
-            if ($value instanceof sfOutputEscaper) {
+            if ($value instanceof \sfOutputEscaper) {
                 // avoid double decoration
                 $copy = clone $value;
 
@@ -117,20 +118,20 @@ public static function escape($escapingMethod, $value)
                 // return the unescaped object
                 return $value;
             }
-            if ($value instanceof sfOutputEscaperSafe) {
+            if ($value instanceof \sfOutputEscaperSafe) {
                 // do not escape objects marked as safe
                 // return the original object
                 return $value->getValue();
             }
-            if ($value instanceof Traversable) {
-                return new sfOutputEscaperIteratorDecorator($escapingMethod, $value);
+            if ($value instanceof \Traversable) {
+                return new \sfOutputEscaperIteratorDecorator($escapingMethod, $value);
             }
 
-            return new sfOutputEscaperObjectDecorator($escapingMethod, $value);
+            return new \sfOutputEscaperObjectDecorator($escapingMethod, $value);
         }
 
         // it must be a resource; cannot escape that.
-        throw new InvalidArgumentException(sprintf('Unable to escape value "%s".', var_export($value, true)));
+        throw new \InvalidArgumentException(sprintf('Unable to escape value "%s".', var_export($value, true)));
     }
 
     /**
@@ -140,7 +141,7 @@ public static function escape($escapingMethod, $value)
      *
      * @return mixed Unescaped value
      *
-     * @throws InvalidArgumentException If the escaping fails
+     * @throws \InvalidArgumentException If the escaping fails
      */
     public static function unescape($value)
     {
@@ -149,7 +150,7 @@ public static function unescape($value)
         }
 
         if (is_scalar($value)) {
-            return html_entity_decode($value, ENT_QUOTES, sfConfig::get('sf_charset'));
+            return html_entity_decode($value, ENT_QUOTES, \sfConfig::get('sf_charset'));
         }
         if (is_array($value)) {
             foreach ($value as $name => $v) {
@@ -159,7 +160,7 @@ public static function unescape($value)
             return $value;
         }
         if (is_object($value)) {
-            return $value instanceof sfOutputEscaper ? $value->getRawValue() : $value;
+            return $value instanceof \sfOutputEscaper ? $value->getRawValue() : $value;
         }
 
         return $value;
@@ -204,7 +205,7 @@ public static function markClassesAsSafe(array $classes)
      */
     public static function markClassAsSafe($class)
     {
-        self::markClassesAsSafe(array($class));
+        self::markClassesAsSafe([$class]);
     }
 
     /**
diff --git a/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
index 59f58c489..8f6a3019e 100644
--- a/lib/escaper/sfOutputEscaperArrayDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperArrayDecorator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,13 +12,13 @@
 /**
  * Output escaping decorator class for arrays.
  *
- * @see        sfOutputEscaper
+ * @see        \sfOutputEscaper
  *
  * @author     Mike Squire <mike@somosis.co.uk>
  *
  * @version    SVN: $Id$
  */
-class sfOutputEscaperArrayDecorator extends sfOutputEscaperGetterDecorator implements Iterator, ArrayAccess, Countable
+class sfOutputEscaperArrayDecorator extends \sfOutputEscaperGetterDecorator implements \Iterator, \ArrayAccess, \Countable
 {
     /**
      * Used by the iterator to know if the current element is valid.
@@ -29,7 +30,7 @@ class sfOutputEscaperArrayDecorator extends sfOutputEscaperGetterDecorator imple
     /**
      * Constructor.
      *
-     * @see sfOutputEscaper
+     * @see \sfOutputEscaper
      */
     public function __construct($escapingMethod, $value)
     {
@@ -71,7 +72,7 @@ public function key()
     #[\ReturnTypeWillChange]
     public function current()
     {
-        return sfOutputEscaper::escape($this->escapingMethod, current($this->value));
+        return \sfOutputEscaper::escape($this->escapingMethod, current($this->value));
     }
 
     /**
@@ -124,7 +125,7 @@ public function offsetGet($offset)
     {
         $value = isset($this->value[$offset]) ? $this->value[$offset] : null;
 
-        return sfOutputEscaper::escape($this->escapingMethod, $value);
+        return \sfOutputEscaper::escape($this->escapingMethod, $value);
     }
 
     /**
@@ -137,12 +138,12 @@ public function offsetGet($offset)
      * @param string $offset (ignored)
      * @param string $value  (ignored)
      *
-     * @throws sfException
+     * @throws \sfException
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        throw new sfException('Cannot set values.');
+        throw new \sfException('Cannot set values.');
     }
 
     /**
@@ -154,12 +155,12 @@ public function offsetSet($offset, $value)
      *
      * @param string $offset (ignored)
      *
-     * @throws sfException
+     * @throws \sfException
      */
     #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        throw new sfException('Cannot unset values.');
+        throw new \sfException('Cannot unset values.');
     }
 
     /**
diff --git a/lib/escaper/sfOutputEscaperGetterDecorator.class.php b/lib/escaper/sfOutputEscaperGetterDecorator.class.php
index e3cac0665..80060f771 100644
--- a/lib/escaper/sfOutputEscaperGetterDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperGetterDecorator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,13 +12,13 @@
 /**
  * Abstract output escaping decorator class for "getter" objects.
  *
- * @see        sfOutputEscaper
+ * @see        \sfOutputEscaper
  *
  * @author     Mike Squire <mike@somosis.co.uk>
  *
  * @version    SVN: $Id$
  */
-abstract class sfOutputEscaperGetterDecorator extends sfOutputEscaper
+abstract class sfOutputEscaperGetterDecorator extends \sfOutputEscaper
 {
     /**
      * Returns the raw, unescaped value associated with the key supplied.
@@ -48,6 +49,6 @@ public function get($key, $escapingMethod = null)
             $escapingMethod = $this->escapingMethod;
         }
 
-        return sfOutputEscaper::escape($escapingMethod, $this->getRaw($key));
+        return \sfOutputEscaper::escape($escapingMethod, $this->getRaw($key));
     }
 }
diff --git a/lib/escaper/sfOutputEscaperIteratorDecorator.class.php b/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
index 3712f626e..8cf14c34d 100644
--- a/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,35 +21,35 @@
  * implement the Traversable interface will cause the constructor to throw an
  * exception.
  *
- * @see        sfOutputEscaper
+ * @see        \sfOutputEscaper
  *
  * @author     Mike Squire <mike@somosis.co.uk>
  *
  * @version    SVN: $Id$
  */
-class sfOutputEscaperIteratorDecorator extends sfOutputEscaperObjectDecorator implements Iterator, ArrayAccess
+class sfOutputEscaperIteratorDecorator extends \sfOutputEscaperObjectDecorator implements \Iterator, \ArrayAccess
 {
     /**
      * The iterator to be used.
      *
-     * @var IteratorIterator
+     * @var \IteratorIterator
      */
     private $iterator;
 
     /**
      * Constructs a new escaping iteratoror using the escaping method and value supplied.
      *
-     * @param string      $escapingMethod The escaping method to use
-     * @param Traversable $value          The iterator to escape
+     * @param string       $escapingMethod The escaping method to use
+     * @param \Traversable $value          The iterator to escape
      */
-    public function __construct($escapingMethod, Traversable $value)
+    public function __construct($escapingMethod, \Traversable $value)
     {
         // Set the original value for __call(). Set our own iterator because passing
         // it to IteratorIterator will lose any other method calls.
 
         parent::__construct($escapingMethod, $value);
 
-        $this->iterator = new IteratorIterator($value);
+        $this->iterator = new \IteratorIterator($value);
     }
 
     /**
@@ -68,7 +69,7 @@ public function rewind()
     #[\ReturnTypeWillChange]
     public function current()
     {
-        return sfOutputEscaper::escape($this->escapingMethod, $this->iterator->current());
+        return \sfOutputEscaper::escape($this->escapingMethod, $this->iterator->current());
     }
 
     /**
@@ -126,7 +127,7 @@ public function offsetExists($offset)
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        return sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
+        return \sfOutputEscaper::escape($this->escapingMethod, $this->value[$offset]);
     }
 
     /**
@@ -139,12 +140,12 @@ public function offsetGet($offset)
      * @param string $offset (ignored)
      * @param string $value  (ignored)
      *
-     * @throws sfException
+     * @throws \sfException
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        throw new sfException('Cannot set values.');
+        throw new \sfException('Cannot set values.');
     }
 
     /**
@@ -156,11 +157,11 @@ public function offsetSet($offset, $value)
      *
      * @param string $offset (ignored)
      *
-     * @throws sfException
+     * @throws \sfException
      */
     #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        throw new sfException('Cannot unset values.');
+        throw new \sfException('Cannot unset values.');
     }
 }
diff --git a/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index 5183dd31a..9ff9da10f 100644
--- a/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,13 +13,13 @@
  * Output escaping object decorator that intercepts all method calls and escapes
  * their return values.
  *
- * @see        sfOutputEscaper
+ * @see        \sfOutputEscaper
  *
  * @author     Mike Squire <mike@somosis.co.uk>
  *
  * @version    SVN: $Id$
  */
-class sfOutputEscaperObjectDecorator extends sfOutputEscaperGetterDecorator implements Countable
+class sfOutputEscaperObjectDecorator extends \sfOutputEscaperGetterDecorator implements \Countable
 {
     /**
      * Magic PHP method that intercepts method calls, calls them on the objects
@@ -55,9 +56,9 @@ public function __call($method, $args)
             $escapingMethod = $this->escapingMethod;
         }
 
-        $value = call_user_func_array(array($this->value, $method), $args);
+        $value = call_user_func_array([$this->value, $method], $args);
 
-        return sfOutputEscaper::escape($escapingMethod, $value);
+        return \sfOutputEscaper::escape($escapingMethod, $value);
     }
 
     /**
@@ -90,12 +91,12 @@ public function __isset($key)
      *
      * @return mixed The unescaped value returned
      *
-     * @throws sfException if the object does not have a callable get() method
+     * @throws \sfException if the object does not have a callable get() method
      */
     public function getRaw($key)
     {
-        if (!is_callable(array($this->value, 'get'))) {
-            throw new sfException('Object does not have a callable get() method.');
+        if (!is_callable([$this->value, 'get'])) {
+            throw new \sfException('Object does not have a callable get() method.');
         }
 
         return $this->value->get($key);
@@ -112,7 +113,7 @@ public function getRaw($key)
     public function count()
     {
         // See https://github.com/symfony/polyfill/commit/d330c0094a47d8edceeea1ed553d6e08215a9fc2
-        if (is_array($this->value) || $this->value instanceof Countable || $this->value instanceof ResourceBundle || $this->value instanceof SimpleXMLElement) {
+        if (is_array($this->value) || $this->value instanceof \Countable || $this->value instanceof \ResourceBundle || $this->value instanceof \SimpleXMLElement) {
             return count($this->value);
         }
 
diff --git a/lib/escaper/sfOutputEscaperSafe.class.php b/lib/escaper/sfOutputEscaperSafe.class.php
index 788c02574..5926599cb 100644
--- a/lib/escaper/sfOutputEscaperSafe.class.php
+++ b/lib/escaper/sfOutputEscaperSafe.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfOutputEscaperSafe extends ArrayIterator
+class sfOutputEscaperSafe extends \ArrayIterator
 {
     protected $value;
 
@@ -50,7 +51,7 @@ public function __set($key, $value)
 
     public function __call($method, $arguments)
     {
-        return call_user_func_array(array($this->value, $method), $arguments);
+        return call_user_func_array([$this->value, $method], $arguments);
     }
 
     public function __isset($key)
diff --git a/lib/event/sfEvent.class.php b/lib/event/sfEvent.class.php
index 018b74cc5..ca354222a 100644
--- a/lib/event/sfEvent.class.php
+++ b/lib/event/sfEvent.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id: sfEvent.class.php 8698 2008-04-30 16:35:28Z fabien $
  */
-class sfEvent implements ArrayAccess
+class sfEvent implements \ArrayAccess
 {
     protected $value;
     protected $processed = false;
@@ -30,7 +31,7 @@ class sfEvent implements ArrayAccess
      * @param string $name       The event name
      * @param array  $parameters An array of parameters
      */
-    public function __construct($subject, $name, $parameters = array())
+    public function __construct($subject, $name, $parameters = [])
     {
         $this->subject = $subject;
         $this->name = $name;
@@ -132,7 +133,7 @@ public function offsetExists($name)
     public function offsetGet($name)
     {
         if (!array_key_exists($name, $this->parameters)) {
-            throw new InvalidArgumentException(sprintf('The event "%s" has no "%s" parameter.', $this->name, $name));
+            throw new \InvalidArgumentException(sprintf('The event "%s" has no "%s" parameter.', $this->name, $name));
         }
 
         return $this->parameters[$name];
diff --git a/lib/event/sfEventDispatcher.class.php b/lib/event/sfEventDispatcher.class.php
index 8a00dda1a..d64f1ee72 100644
--- a/lib/event/sfEventDispatcher.class.php
+++ b/lib/event/sfEventDispatcher.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +20,7 @@
  */
 class sfEventDispatcher
 {
-    protected $listeners = array();
+    protected $listeners = [];
 
     /**
      * Connects a listener to a given event name.
@@ -30,7 +31,7 @@ class sfEventDispatcher
     public function connect($name, $listener)
     {
         if (!isset($this->listeners[$name])) {
-            $this->listeners[$name] = array();
+            $this->listeners[$name] = [];
         }
 
         $this->listeners[$name][] = $listener;
@@ -60,11 +61,11 @@ public function disconnect($name, $listener)
     /**
      * Notifies all listeners of a given event.
      *
-     * @param sfEvent $event A sfEvent instance
+     * @param \sfEvent $event A sfEvent instance
      *
-     * @return sfEvent The sfEvent instance
+     * @return \sfEvent The sfEvent instance
      */
-    public function notify(sfEvent $event)
+    public function notify(\sfEvent $event)
     {
         foreach ($this->getListeners($event->getName()) as $listener) {
             call_user_func($listener, $event);
@@ -76,11 +77,11 @@ public function notify(sfEvent $event)
     /**
      * Notifies all listeners of a given event until one returns a non null value.
      *
-     * @param sfEvent $event A sfEvent instance
+     * @param \sfEvent $event A sfEvent instance
      *
-     * @return sfEvent The sfEvent instance
+     * @return \sfEvent The sfEvent instance
      */
-    public function notifyUntil(sfEvent $event)
+    public function notifyUntil(\sfEvent $event)
     {
         foreach ($this->getListeners($event->getName()) as $listener) {
             if (call_user_func($listener, $event)) {
@@ -96,15 +97,15 @@ public function notifyUntil(sfEvent $event)
     /**
      * Filters a value by calling all listeners of a given event.
      *
-     * @param sfEvent $event A sfEvent instance
-     * @param mixed   $value The value to be filtered
+     * @param \sfEvent $event A sfEvent instance
+     * @param mixed    $value The value to be filtered
      *
-     * @return sfEvent The sfEvent instance
+     * @return \sfEvent The sfEvent instance
      */
-    public function filter(sfEvent $event, $value)
+    public function filter(\sfEvent $event, $value)
     {
         foreach ($this->getListeners($event->getName()) as $listener) {
-            $value = call_user_func_array($listener, array($event, $value));
+            $value = call_user_func_array($listener, [$event, $value]);
         }
 
         $event->setReturnValue($value);
@@ -122,7 +123,7 @@ public function filter(sfEvent $event, $value)
     public function hasListeners($name)
     {
         if (!isset($this->listeners[$name])) {
-            $this->listeners[$name] = array();
+            $this->listeners[$name] = [];
         }
 
         return (bool) count($this->listeners[$name]);
@@ -138,7 +139,7 @@ public function hasListeners($name)
     public function getListeners($name)
     {
         if (!isset($this->listeners[$name])) {
-            return array();
+            return [];
         }
 
         return $this->listeners[$name];
diff --git a/lib/exception/data/error.atom.php b/lib/exception/data/error.atom.php
index 7f2a14d27..bf2ec1441 100644
--- a/lib/exception/data/error.atom.php
+++ b/lib/exception/data/error.atom.php
@@ -1,3 +1,12 @@
 <?php
 
-include sfException::getTemplatePathForError('xml', false);
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+include \sfException::getTemplatePathForError('xml', false);
diff --git a/lib/exception/data/error.html.php b/lib/exception/data/error.html.php
index a8c3acb9c..b2091b345 100644
--- a/lib/exception/data/error.html.php
+++ b/lib/exception/data/error.html.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<?php $path = sfConfig::get('sf_relative_url_root', preg_replace('#/[^/]+\.php5?$#', '', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : (isset($_SERVER['ORIG_SCRIPT_NAME']) ? $_SERVER['ORIG_SCRIPT_NAME'] : ''))); ?>
+<?php $path = \sfConfig::get('sf_relative_url_root', preg_replace('#/[^/]+\.php5?$#', '', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : (isset($_SERVER['ORIG_SCRIPT_NAME']) ? $_SERVER['ORIG_SCRIPT_NAME'] : ''))); ?>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
diff --git a/lib/exception/data/error.json.php b/lib/exception/data/error.json.php
index fc6951883..fe109f38d 100644
--- a/lib/exception/data/error.json.php
+++ b/lib/exception/data/error.json.php
@@ -1,7 +1,16 @@
 <?php
 
-echo json_encode(array(
-    'error' => array(
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+echo json_encode([
+    'error' => [
         'code' => $code,
         'message' => $text,
-    )));
+    ]]);
diff --git a/lib/exception/data/error.rdf.php b/lib/exception/data/error.rdf.php
index 7f2a14d27..bf2ec1441 100644
--- a/lib/exception/data/error.rdf.php
+++ b/lib/exception/data/error.rdf.php
@@ -1,3 +1,12 @@
 <?php
 
-include sfException::getTemplatePathForError('xml', false);
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+include \sfException::getTemplatePathForError('xml', false);
diff --git a/lib/exception/data/error.xml.php b/lib/exception/data/error.xml.php
index 128a17b7e..310a5f626 100644
--- a/lib/exception/data/error.xml.php
+++ b/lib/exception/data/error.xml.php
@@ -1,2 +1,2 @@
-<?php echo sprintf('<?xml version="1.0" encoding="%s" ?>', sfConfig::get('sf_charset', 'UTF-8'))."\n"; ?>
+<?php echo sprintf('<?xml version="1.0" encoding="%s" ?>', \sfConfig::get('sf_charset', 'UTF-8'))."\n"; ?>
 <error code="<?php echo $code; ?>" message="<?php echo $text; ?>" />
diff --git a/lib/exception/data/exception.atom.php b/lib/exception/data/exception.atom.php
index 503c53f19..c8090372b 100644
--- a/lib/exception/data/exception.atom.php
+++ b/lib/exception/data/exception.atom.php
@@ -1,3 +1,12 @@
 <?php
 
-include sfException::getTemplatePathForError('xml', true);
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+include \sfException::getTemplatePathForError('xml', true);
diff --git a/lib/exception/data/exception.html.php b/lib/exception/data/exception.html.php
index 8e47ef618..9ba22acfd 100644
--- a/lib/exception/data/exception.html.php
+++ b/lib/exception/data/exception.html.php
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <title><?php echo $name; ?>: <?php echo htmlspecialchars($message, ENT_QUOTES, sfConfig::get('sf_charset', 'UTF-8')); ?></title>
+  <title><?php echo $name; ?>: <?php echo htmlspecialchars($message, ENT_QUOTES, \sfConfig::get('sf_charset', 'UTF-8')); ?></title>
   <style type="text/css">
   body { margin: 0; padding: 20px; margin-top: 20px; background-color: #eee }
   body, td, th { font: 11px Verdana, Arial, sans-serif; color: #333 }
@@ -36,7 +36,7 @@ function toggle(id)
   <center><div id="main">
   <div style="float: right"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAZCAYAAAAiwE4nAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAEfklEQVRIx7VUa0wUVxT+Znd2FxZk0YKACAtaGwEDUhUTBTEIItmKYk3UNqalD7StMSQ1JKatP5omTYyx0VRrjPERX7XWAG2t9GVi3drU2h+gi4BCWV67lOe6O/uYmXtPf0BRrMBK6UlObmbON9935p6HQEQI1o7uXeSy1dsjHn2Xlpr0oKzililoEiIKymvOr9q+pzyZZN894moHcbWDZN892lOeTN9fKHgrWB5NsInZ7joOrtv4JgR2F4r0AxTpRwisEes2bsNtW+eBYHmCEqw8kVsp6oy6jMUFYIoTxFUQqWBqNzIWr4aoC9NVnlxZNSWC1mqLsa6ubd36zbug+m3gXBlypoCYAuavx4Ytu1Fbay+2VluME/GJEwHsnT3WpLlzhbi4Z6D46gBosP/gVQDA669kIzJSRWxcApLnPie0dw3cALBw0k1z5dyKrIqyWHL1/Eye7n3kcX5MH75fRAAIAJUUZ5Cnez9JPYfI1XuDKsriqOZcbtakm6alte/yqsIi6LVt4KobxAIAqSPxwUEJxAPgqgcG0YH8NS+gxT5wZVI1/PrU0q1O54OoFfmvQZZsIBYA5zIy0maOYFZmJ4GYAuIyZG8jcvLfgMPhmnHlbG7pUws2NfUeWVvyMpj3d3DVB84C4MyPxNkP+8I0TQRn/qGY6gP316J4w6uob3AceirBzw9nnBD1RmN65nLIUhOIBUBcBjEZ5viQEZx5thFcdQ+50o+A5w7SM5dBFHWhFz5bdOpJ3MLjq63mdHrIr7f6PaXbPtBGht4DUwYAQXikyVTkb/gKtbYBNFpzYYoY3egarR6D7jCcPmtly5ZEh6/ZWucfdyycPep3ycmJ2phoAzx9ziERLoMzN4hJAICI8KEkp4VxcCaP+p4zGdHTw2FOiNB2OTzfAMgf80qrjmem1zf256zf9B6kvmvgqgeqrw2qvx1cGQRxBcQV5GRFIGepaeT5cfdJXbAUPY+79z15l47MWzDmH7a3P/g2Ly9X4O6LkKUWEPeOMbwMpnANiClPDkOBXteL3OXxQnNL72UA5n/V8NLR9Bdrb/ddLN+5VvD23wTA8d9MgNH0LD759DrS5oeUbN7RWjXqSu//OXi8sCBFkN11IFJAxMZ0e4cP12+6xsUQqZC9nShclYTWtsDJUTU8cyDlsE7URqTMC4Eiu8fN+/JVF7I3NuGlna2wlDaPi1VkN1LnR0GvF00n95kPAICm+tgcQ9N9V5ll9Tz4JSem2vySE5bCFDS3+t+uPjbHIA64dF/MioU2aoYGXndgQgJLngnWL0PR1iUje0n4hHimBhA1XYA5IVz8q1eu0oSGqCc6HV4ihAIQgso6MV4flNhDUR/iYqbBI1GqZtM7zVUzZ4p3rl5rQIgxesqvVCsa0O8y4Lc/nGp8rLhcBIA7Df7C7hlKe2ZGojYmZsGUCsqygvOnf6FZsbrtm3bY+wUigiAIC/funlXR0RXYgv/BzAmGn979qGvXyOALghAJQAtAB0A/fIrDY6MNurj/LBqADW8OFYACQB4+2d80or7Ra0ZtxAAAAABJRU5ErkJggg==" /></div>
   <h1><?php echo $code; ?> | <?php echo $text; ?> | <?php echo $name; ?></h1>
-  <h2 id="message"><?php echo str_replace("\n", '<br />', htmlspecialchars($message, ENT_QUOTES, sfConfig::get('sf_charset', 'UTF-8'))); ?></h2>
+  <h2 id="message"><?php echo str_replace("\n", '<br />', htmlspecialchars($message, ENT_QUOTES, \sfConfig::get('sf_charset', 'UTF-8'))); ?></h2>
   <h2>stack trace</h2>
   <ul><li><?php echo implode('</li><li>', $traces); ?></li></ul>
 
diff --git a/lib/exception/data/exception.json.php b/lib/exception/data/exception.json.php
index 2a7c24840..c079b5f2e 100644
--- a/lib/exception/data/exception.json.php
+++ b/lib/exception/data/exception.json.php
@@ -1,12 +1,21 @@
 <?php
 
-echo json_encode(array(
-    'error' => array(
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+echo json_encode([
+    'error' => [
         'code' => $code,
         'message' => $message,
-        'debug' => array(
+        'debug' => [
             'name' => $name,
             'message' => $message,
             'traces' => $traces,
-        ),
-    )));
+        ],
+    ]]);
diff --git a/lib/exception/data/exception.rdf.php b/lib/exception/data/exception.rdf.php
index 503c53f19..c8090372b 100644
--- a/lib/exception/data/exception.rdf.php
+++ b/lib/exception/data/exception.rdf.php
@@ -1,3 +1,12 @@
 <?php
 
-include sfException::getTemplatePathForError('xml', true);
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+include \sfException::getTemplatePathForError('xml', true);
diff --git a/lib/exception/data/exception.xml.php b/lib/exception/data/exception.xml.php
index 6315d92ed..30429caf2 100644
--- a/lib/exception/data/exception.xml.php
+++ b/lib/exception/data/exception.xml.php
@@ -1,8 +1,8 @@
-<?php echo sprintf('<?xml version="1.0" encoding="%s" ?>', sfConfig::get('sf_charset', 'UTF-8'))."\n"; ?>
+<?php echo sprintf('<?xml version="1.0" encoding="%s" ?>', \sfConfig::get('sf_charset', 'UTF-8'))."\n"; ?>
 <error code="<?php echo $code; ?>" message="<?php echo $text; ?>">
   <debug>
     <name><?php echo $name; ?></name>
-    <message><?php echo htmlspecialchars($message, ENT_QUOTES, sfConfig::get('sf_charset', 'UTF-8')); ?></message>
+    <message><?php echo htmlspecialchars($message, ENT_QUOTES, \sfConfig::get('sf_charset', 'UTF-8')); ?></message>
     <traces>
 <?php foreach ($traces as $trace) { ?>
         <trace><?php echo $trace; ?></trace>
diff --git a/lib/exception/data/unavailable.php b/lib/exception/data/unavailable.php
index 13b33e378..70da2f6f7 100644
--- a/lib/exception/data/unavailable.php
+++ b/lib/exception/data/unavailable.php
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo sfConfig::get('sf_charset', 'utf-8'); ?>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo \sfConfig::get('sf_charset', 'utf-8'); ?>" />
 <meta name="title" content="symfony project" />
 <meta name="robots" content="index, follow" />
 <meta name="description" content="symfony project" />
diff --git a/lib/exception/sfCacheException.class.php b/lib/exception/sfCacheException.class.php
index 3080e585d..52c28b595 100644
--- a/lib/exception/sfCacheException.class.php
+++ b/lib/exception/sfCacheException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfCacheException extends sfException
+class sfCacheException extends \sfException
 {
 }
diff --git a/lib/exception/sfConfigurationException.class.php b/lib/exception/sfConfigurationException.class.php
index d8dc79ef8..4dc3aa258 100644
--- a/lib/exception/sfConfigurationException.class.php
+++ b/lib/exception/sfConfigurationException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfConfigurationException extends sfException
+class sfConfigurationException extends \sfException
 {
 }
diff --git a/lib/exception/sfControllerException.class.php b/lib/exception/sfControllerException.class.php
index 2c1d92e65..158ae683e 100644
--- a/lib/exception/sfControllerException.class.php
+++ b/lib/exception/sfControllerException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfControllerException extends sfException
+class sfControllerException extends \sfException
 {
 }
diff --git a/lib/exception/sfDatabaseException.class.php b/lib/exception/sfDatabaseException.class.php
index c428803b9..c32059699 100644
--- a/lib/exception/sfDatabaseException.class.php
+++ b/lib/exception/sfDatabaseException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfDatabaseException extends sfException
+class sfDatabaseException extends \sfException
 {
 }
diff --git a/lib/exception/sfError404Exception.class.php b/lib/exception/sfError404Exception.class.php
index ebca947f0..e8273b266 100644
--- a/lib/exception/sfError404Exception.class.php
+++ b/lib/exception/sfError404Exception.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfError404Exception extends sfException
+class sfError404Exception extends \sfException
 {
     /**
      * Forwards to the 404 action.
@@ -24,11 +25,11 @@ public function printStackTrace()
     {
         $exception = null === $this->wrappedException ? $this : $this->wrappedException;
 
-        if (sfConfig::get('sf_debug')) {
-            $response = sfContext::getInstance()->getResponse();
+        if (\sfConfig::get('sf_debug')) {
+            $response = \sfContext::getInstance()->getResponse();
             if (null === $response) {
-                $response = new sfWebResponse(sfContext::getInstance()->getEventDispatcher());
-                sfContext::getInstance()->setResponse($response);
+                $response = new \sfWebResponse(\sfContext::getInstance()->getEventDispatcher());
+                \sfContext::getInstance()->setResponse($response);
             }
 
             $response->setStatusCode(404);
@@ -37,10 +38,10 @@ public function printStackTrace()
         }
 
         // log all exceptions in php log
-        if (!sfConfig::get('sf_test')) {
+        if (!\sfConfig::get('sf_test')) {
             error_log($this->getMessage());
         }
 
-        sfContext::getInstance()->getController()->forward(sfConfig::get('sf_error_404_module'), sfConfig::get('sf_error_404_action'));
+        \sfContext::getInstance()->getController()->forward(\sfConfig::get('sf_error_404_module'), \sfConfig::get('sf_error_404_action'));
     }
 }
diff --git a/lib/exception/sfException.class.php b/lib/exception/sfException.class.php
index 72a928bb3..6a76385a5 100644
--- a/lib/exception/sfException.class.php
+++ b/lib/exception/sfException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfException extends Exception
+class sfException extends \Exception
 {
     /** @var Exception|Throwable|null */
     protected $wrappedException;
@@ -31,11 +31,11 @@ class sfException extends Exception
      *
      * @param Exception|Throwable $e An Throwable instance
      *
-     * @return sfException An sfException instance that wraps the given Throwable object
+     * @return \sfException An sfException instance that wraps the given Throwable object
      */
     public static function createFromException($e)
     {
-        $exception = new sfException(sprintf('Wrapped %s: %s', get_class($e), $e->getMessage()));
+        $exception = new \sfException(sprintf('Wrapped %s: %s', get_class($e), $e->getMessage()));
         $exception->setWrappedException($e);
         self::$lastException = $e;
 
@@ -83,7 +83,7 @@ public function printStackTrace()
 
         $exception = $this->wrappedException;
 
-        if (!sfConfig::get('sf_test')) {
+        if (!\sfConfig::get('sf_test')) {
             // log all exceptions in php log
             error_log($exception->getMessage());
 
@@ -94,7 +94,7 @@ public function printStackTrace()
                 }
             }
 
-            if (sfConfig::get('sf_compressed')) {
+            if (\sfConfig::get('sf_compressed')) {
                 ob_start('ob_gzhandler');
             }
 
@@ -104,16 +104,16 @@ public function printStackTrace()
         if (version_compare(PHP_VERSION, '7.0.0') >= 0) {
             try {
                 $this->outputStackTrace($exception);
-            } catch (Throwable $e) {
+            } catch (\Throwable $e) {
             }
         } else {
             try {
                 $this->outputStackTrace($exception);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
             }
         }
 
-        if (!sfConfig::get('sf_test')) {
+        if (!\sfConfig::get('sf_test')) {
             exit(1);
         }
     }
@@ -129,11 +129,11 @@ public function printStackTrace()
      */
     public static function getTemplatePathForError($format, $debug)
     {
-        $templatePaths = array(
-            sfConfig::get('sf_app_config_dir').'/error',
-            sfConfig::get('sf_config_dir').'/error',
+        $templatePaths = [
+            \sfConfig::get('sf_app_config_dir').'/error',
+            \sfConfig::get('sf_config_dir').'/error',
             __DIR__.'/data',
-        );
+        ];
 
         $template = sprintf('%s.%s.php', $debug ? 'exception' : 'error', $format);
         foreach ($templatePaths as $path) {
@@ -157,17 +157,17 @@ protected static function outputStackTrace($exception)
         $text = 'Internal Server Error';
 
         $response = null;
-        if (class_exists('sfContext', false) && sfContext::hasInstance() && is_object($request = sfContext::getInstance()->getRequest()) && is_object($response = sfContext::getInstance()->getResponse())) {
-            /** @var sfWebRequest $request */
-            /** @var sfWebResponse $response */
-            $dispatcher = sfContext::getInstance()->getEventDispatcher();
-
-            if (sfConfig::get('sf_logging_enabled')) {
-                $priority = $exception instanceof sfError404Exception ? sfLogger::ERR : sfLogger::CRIT;
-                $dispatcher->notify(new sfEvent($exception, 'application.log', array($exception->getMessage(), 'priority' => $priority)));
+        if (class_exists('sfContext', false) && \sfContext::hasInstance() && is_object($request = \sfContext::getInstance()->getRequest()) && is_object($response = \sfContext::getInstance()->getResponse())) {
+            /** @var \sfWebRequest $request */
+            /** @var \sfWebResponse $response */
+            $dispatcher = \sfContext::getInstance()->getEventDispatcher();
+
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $priority = $exception instanceof \sfError404Exception ? \sfLogger::ERR : \sfLogger::CRIT;
+                $dispatcher->notify(new \sfEvent($exception, 'application.log', [$exception->getMessage(), 'priority' => $priority]));
             }
 
-            $event = $dispatcher->notifyUntil(new sfEvent($exception, 'application.throw_exception'));
+            $event = $dispatcher->notifyUntil(new \sfEvent($exception, 'application.throw_exception'));
             if ($event->isProcessed()) {
                 return;
             }
@@ -179,7 +179,7 @@ protected static function outputStackTrace($exception)
 
             $response->setContentType('text/html');
 
-            if (!sfConfig::get('sf_test')) {
+            if (!\sfConfig::get('sf_test')) {
                 foreach ($response->getHttpHeaders() as $name => $value) {
                     header($name.': '.$value);
                 }
@@ -198,13 +198,13 @@ protected static function outputStackTrace($exception)
             }
         } else {
             // a backward compatible default
-            if (!sfConfig::get('sf_test')) {
-                header('Content-Type: text/html; charset='.sfConfig::get('sf_charset', 'utf-8'));
+            if (!\sfConfig::get('sf_test')) {
+                header('Content-Type: text/html; charset='.\sfConfig::get('sf_charset', 'utf-8'));
             }
         }
 
         // send an error 500 if not in debug mode
-        if (!sfConfig::get('sf_debug')) {
+        if (!\sfConfig::get('sf_debug')) {
             if ($template = self::getTemplatePathForError($format, false)) {
                 include $template;
 
@@ -225,13 +225,13 @@ protected static function outputStackTrace($exception)
         // dump main objects values
         $sf_settings = '';
         $settingsTable = $requestTable = $responseTable = $globalsTable = $userTable = '';
-        if (class_exists('sfContext', false) && sfContext::hasInstance()) {
-            $context = sfContext::getInstance();
-            $settingsTable = self::formatArrayAsHtml(sfDebug::settingsAsArray());
-            $requestTable = self::formatArrayAsHtml(sfDebug::requestAsArray($context->getRequest()));
-            $responseTable = self::formatArrayAsHtml(sfDebug::responseAsArray($context->getResponse()));
-            $userTable = self::formatArrayAsHtml(sfDebug::userAsArray($context->getUser()));
-            $globalsTable = self::formatArrayAsHtml(sfDebug::globalsAsArray());
+        if (class_exists('sfContext', false) && \sfContext::hasInstance()) {
+            $context = \sfContext::getInstance();
+            $settingsTable = self::formatArrayAsHtml(\sfDebug::settingsAsArray());
+            $requestTable = self::formatArrayAsHtml(\sfDebug::requestAsArray($context->getRequest()));
+            $responseTable = self::formatArrayAsHtml(\sfDebug::responseAsArray($context->getResponse()));
+            $userTable = self::formatArrayAsHtml(\sfDebug::userAsArray($context->getUser()));
+            $globalsTable = self::formatArrayAsHtml(\sfDebug::globalsAsArray());
         }
 
         if (isset($response) && $response) {
@@ -245,7 +245,7 @@ protected static function outputStackTrace($exception)
                 include $template;
                 $content = ob_get_clean();
 
-                $event = $dispatcher->filter(new sfEvent($response, 'response.filter_content'), $content);
+                $event = $dispatcher->filter(new \sfEvent($response, 'response.filter_content'), $content);
 
                 echo $event->getReturnValue();
             } else {
@@ -267,14 +267,14 @@ protected static function outputStackTrace($exception)
     protected static function getTraces($exception, $format = 'txt')
     {
         $traceData = $exception->getTrace();
-        array_unshift($traceData, array(
+        array_unshift($traceData, [
             'function' => '',
             'file' => null != $exception->getFile() ? $exception->getFile() : null,
             'line' => null != $exception->getLine() ? $exception->getLine() : null,
-            'args' => array(),
-        ));
+            'args' => [],
+        ]);
 
-        $traces = array();
+        $traces = [];
         if ('html' == $format) {
             $lineFormat = 'at <strong>%s%s%s</strong>(%s)<br />in <em>%s</em> line %s <a href="#" onclick="toggle(\'%s\'); return false;">...</a><br /><ul class="code" id="%s" style="display: %s">%s</ul>';
         } else {
@@ -284,14 +284,14 @@ protected static function getTraces($exception, $format = 'txt')
         for ($i = 0, $count = count($traceData); $i < $count; ++$i) {
             $line = isset($traceData[$i]['line']) ? $traceData[$i]['line'] : null;
             $file = isset($traceData[$i]['file']) ? $traceData[$i]['file'] : null;
-            $args = isset($traceData[$i]['args']) ? $traceData[$i]['args'] : array();
+            $args = isset($traceData[$i]['args']) ? $traceData[$i]['args'] : [];
             $traces[] = sprintf(
                 $lineFormat,
                 isset($traceData[$i]['class']) ? $traceData[$i]['class'] : '',
                 isset($traceData[$i]['type']) ? $traceData[$i]['type'] : '',
                 $traceData[$i]['function'],
                 self::formatArgs($args, false, $format),
-                self::formatFile($file, $line, $format, null === $file ? 'n/a' : sfDebug::shortenFilePath($file)),
+                self::formatFile($file, $line, $format, null === $file ? 'n/a' : \sfDebug::shortenFilePath($file)),
                 null === $line ? 'n/a' : $line,
                 'trace_'.$i,
                 'trace_'.$i,
@@ -312,7 +312,7 @@ protected static function getTraces($exception, $format = 'txt')
      */
     protected static function formatArrayAsHtml($values)
     {
-        return '<pre>'.self::escape(@sfYaml::dump($values)).'</pre>';
+        return '<pre>'.self::escape(@\sfYaml::dump($values)).'</pre>';
     }
 
     /**
@@ -333,7 +333,7 @@ protected static function fileExcerpt($file, $line)
         if (is_readable($file)) {
             $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));
 
-            $lines = array();
+            $lines = [];
             for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {
                 $lines[] = '<li'.($i == $line ? ' class="selected"' : '').'>'.$content[$i - 1].'</li>';
             }
@@ -353,9 +353,9 @@ protected static function fileExcerpt($file, $line)
      */
     protected static function formatArgs($args, $single = false, $format = 'html')
     {
-        $result = array();
+        $result = [];
 
-        $single and $args = array($args);
+        $single and $args = [$args];
 
         foreach ($args as $key => $value) {
             if (is_object($value)) {
@@ -392,8 +392,8 @@ protected static function formatFile($file, $line, $format = 'html', $text = nul
             $text = $file;
         }
 
-        if ('html' == $format && $file && $line && $linkFormat = sfConfig::get('sf_file_link_format', ini_get('xdebug.file_link_format'))) {
-            $link = strtr($linkFormat, array('%f' => $file, '%l' => $line));
+        if ('html' == $format && $file && $line && $linkFormat = \sfConfig::get('sf_file_link_format', ini_get('xdebug.file_link_format'))) {
+            $link = strtr($linkFormat, ['%f' => $file, '%l' => $line]);
             $text = sprintf('<a href="%s" title="Click to open this file" class="file_link">%s</a>', $link, $text);
         }
 
@@ -413,6 +413,6 @@ protected static function escape($value)
             return $value;
         }
 
-        return htmlspecialchars($value, ENT_QUOTES, sfConfig::get('sf_charset', 'UTF-8'));
+        return htmlspecialchars($value, ENT_QUOTES, \sfConfig::get('sf_charset', 'UTF-8'));
     }
 }
diff --git a/lib/exception/sfFactoryException.class.php b/lib/exception/sfFactoryException.class.php
index 09ace8583..d626f0ff3 100644
--- a/lib/exception/sfFactoryException.class.php
+++ b/lib/exception/sfFactoryException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfFactoryException extends sfException
+class sfFactoryException extends \sfException
 {
 }
diff --git a/lib/exception/sfFileException.class.php b/lib/exception/sfFileException.class.php
index 6d208aa90..6f5995c0b 100644
--- a/lib/exception/sfFileException.class.php
+++ b/lib/exception/sfFileException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfFileException extends sfException
+class sfFileException extends \sfException
 {
 }
diff --git a/lib/exception/sfFilterException.class.php b/lib/exception/sfFilterException.class.php
index 57205203f..55d6cf2e0 100644
--- a/lib/exception/sfFilterException.class.php
+++ b/lib/exception/sfFilterException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfFilterException extends sfException
+class sfFilterException extends \sfException
 {
 }
diff --git a/lib/exception/sfForwardException.class.php b/lib/exception/sfForwardException.class.php
index 55daadb99..6e5328bcc 100644
--- a/lib/exception/sfForwardException.class.php
+++ b/lib/exception/sfForwardException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfForwardException extends sfException
+class sfForwardException extends \sfException
 {
 }
diff --git a/lib/exception/sfInitializationException.class.php b/lib/exception/sfInitializationException.class.php
index 72ffedc22..9773fd768 100644
--- a/lib/exception/sfInitializationException.class.php
+++ b/lib/exception/sfInitializationException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfInitializationException extends sfException
+class sfInitializationException extends \sfException
 {
 }
diff --git a/lib/exception/sfParseException.class.php b/lib/exception/sfParseException.class.php
index 2ac7cccd6..42ec7ab01 100644
--- a/lib/exception/sfParseException.class.php
+++ b/lib/exception/sfParseException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfParseException extends sfException
+class sfParseException extends \sfException
 {
 }
diff --git a/lib/exception/sfRenderException.class.php b/lib/exception/sfRenderException.class.php
index d37d578a3..72a159fad 100644
--- a/lib/exception/sfRenderException.class.php
+++ b/lib/exception/sfRenderException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfRenderException extends sfException
+class sfRenderException extends \sfException
 {
 }
diff --git a/lib/exception/sfSecurityException.class.php b/lib/exception/sfSecurityException.class.php
index 65de552a5..0f43de4d8 100644
--- a/lib/exception/sfSecurityException.class.php
+++ b/lib/exception/sfSecurityException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfSecurityException extends sfException
+class sfSecurityException extends \sfException
 {
 }
diff --git a/lib/exception/sfStopException.class.php b/lib/exception/sfStopException.class.php
index 2a93e279f..100f94493 100644
--- a/lib/exception/sfStopException.class.php
+++ b/lib/exception/sfStopException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfStopException extends sfException
+class sfStopException extends \sfException
 {
     /**
      * Stops the current action.
diff --git a/lib/exception/sfStorageException.class.php b/lib/exception/sfStorageException.class.php
index 7bf258518..ecfad3367 100644
--- a/lib/exception/sfStorageException.class.php
+++ b/lib/exception/sfStorageException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfStorageException extends sfException
+class sfStorageException extends \sfException
 {
 }
diff --git a/lib/exception/sfViewException.class.php b/lib/exception/sfViewException.class.php
index 4715fd95d..b99d11600 100644
--- a/lib/exception/sfViewException.class.php
+++ b/lib/exception/sfViewException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfViewException extends sfException
+class sfViewException extends \sfException
 {
 }
diff --git a/lib/filter/sfBasicSecurityFilter.class.php b/lib/filter/sfBasicSecurityFilter.class.php
index edffbcda1..727aff0be 100644
--- a/lib/filter/sfBasicSecurityFilter.class.php
+++ b/lib/filter/sfBasicSecurityFilter.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,19 +19,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfBasicSecurityFilter extends sfFilter
+class sfBasicSecurityFilter extends \sfFilter
 {
     /**
      * Executes this filter.
      *
-     * @param sfFilterChain $filterChain A sfFilterChain instance
+     * @param \sfFilterChain $filterChain A sfFilterChain instance
      */
     public function execute($filterChain)
     {
         // disable security on login and secure actions
         if (
-            (sfConfig::get('sf_login_module') == $this->context->getModuleName()) && (sfConfig::get('sf_login_action') == $this->context->getActionName())
-            || (sfConfig::get('sf_secure_module') == $this->context->getModuleName()) && (sfConfig::get('sf_secure_action') == $this->context->getActionName())
+            (\sfConfig::get('sf_login_module') == $this->context->getModuleName()) && (\sfConfig::get('sf_login_action') == $this->context->getActionName())
+            || (\sfConfig::get('sf_secure_module') == $this->context->getModuleName()) && (\sfConfig::get('sf_secure_action') == $this->context->getActionName())
         ) {
             $filterChain->execute();
 
@@ -42,8 +42,8 @@ public function execute($filterChain)
         //       is vague enough to describe any level of security and can be
         //       used to retrieve such data and should never have to be altered
         if (!$this->context->getUser()->isAuthenticated()) {
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->context->getEventDispatcher()->notify(new sfEvent($this, 'application.log', array(sprintf('Action "%s/%s" requires authentication, forwarding to "%s/%s"', $this->context->getModuleName(), $this->context->getActionName(), sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action')))));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->context->getEventDispatcher()->notify(new \sfEvent($this, 'application.log', [sprintf('Action "%s/%s" requires authentication, forwarding to "%s/%s"', $this->context->getModuleName(), $this->context->getActionName(), \sfConfig::get('sf_login_module'), \sfConfig::get('sf_login_action'))]));
             }
 
             // the user is not authenticated
@@ -53,8 +53,8 @@ public function execute($filterChain)
         // the user is authenticated
         $credential = $this->getUserCredential();
         if (null !== $credential && !$this->context->getUser()->hasCredential($credential)) {
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->context->getEventDispatcher()->notify(new sfEvent($this, 'application.log', array(sprintf('Action "%s/%s" requires credentials "%s", forwarding to "%s/%s"', $this->context->getModuleName(), $this->context->getActionName(), sfYaml::dump($credential, 0), sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action')))));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->context->getEventDispatcher()->notify(new \sfEvent($this, 'application.log', [sprintf('Action "%s/%s" requires credentials "%s", forwarding to "%s/%s"', $this->context->getModuleName(), $this->context->getActionName(), \sfYaml::dump($credential, 0), \sfConfig::get('sf_secure_module'), \sfConfig::get('sf_secure_action'))]));
             }
 
             // the user doesn't have access
@@ -68,25 +68,25 @@ public function execute($filterChain)
     /**
      * Forwards the current request to the secure action.
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      */
     protected function forwardToSecureAction()
     {
-        $this->context->getController()->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action'));
+        $this->context->getController()->forward(\sfConfig::get('sf_secure_module'), \sfConfig::get('sf_secure_action'));
 
-        throw new sfStopException();
+        throw new \sfStopException();
     }
 
     /**
      * Forwards the current request to the login action.
      *
-     * @throws sfStopException
+     * @throws \sfStopException
      */
     protected function forwardToLoginAction()
     {
-        $this->context->getController()->forward(sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
+        $this->context->getController()->forward(\sfConfig::get('sf_login_module'), \sfConfig::get('sf_login_action'));
 
-        throw new sfStopException();
+        throw new \sfStopException();
     }
 
     /**
diff --git a/lib/filter/sfCacheFilter.class.php b/lib/filter/sfCacheFilter.class.php
index fab675605..60c507838 100644
--- a/lib/filter/sfCacheFilter.class.php
+++ b/lib/filter/sfCacheFilter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,23 +16,23 @@
  *
  * @version    SVN: $Id$
  */
-class sfCacheFilter extends sfFilter
+class sfCacheFilter extends \sfFilter
 {
     protected $cacheManager;
     protected $request;
     protected $response;
     protected $routing;
-    protected $cache = array();
+    protected $cache = [];
 
     /**
      * Initializes this Filter.
      *
-     * @param sfContext $context    The current application context
-     * @param array     $parameters An associative array of initialization parameters
+     * @param \sfContext $context    The current application context
+     * @param array      $parameters An associative array of initialization parameters
      *
-     * @throws sfInitializationException If an error occurs while initializing this Filter
+     * @throws \sfInitializationException If an error occurs while initializing this Filter
      */
-    public function initialize($context, $parameters = array())
+    public function initialize($context, $parameters = [])
     {
         parent::initialize($context, $parameters);
 
@@ -44,12 +45,12 @@ public function initialize($context, $parameters = array())
     /**
      * Executes this filter.
      *
-     * @param sfFilterChain $filterChain A sfFilterChain instance
+     * @param \sfFilterChain $filterChain A sfFilterChain instance
      */
     public function execute($filterChain)
     {
         // execute this filter only once, if cache is set and no GET or POST parameters
-        if (!sfConfig::get('sf_cache')) {
+        if (!\sfConfig::get('sf_cache')) {
             $filterChain->execute();
 
             return;
@@ -160,7 +161,7 @@ protected function setCacheValidation($uri)
             $this->response->setHttpHeader('Last-Modified', $this->response->getDate(time()), false);
         }
 
-        if (sfConfig::get('sf_etag')) {
+        if (\sfConfig::get('sf_etag')) {
             $etag = '"'.md5($this->response->getContent()).'"';
             $this->response->setHttpHeader('ETag', $etag);
         }
@@ -172,29 +173,29 @@ protected function setCacheValidation($uri)
     protected function checkCacheValidation()
     {
         // Etag support
-        if (sfConfig::get('sf_etag')) {
+        if (\sfConfig::get('sf_etag')) {
             $etag = '"'.md5($this->response->getContent()).'"';
 
             if ($this->request->getHttpHeader('IF_NONE_MATCH') == $etag) {
                 $this->response->setStatusCode(304);
                 $this->response->setHeaderOnly(true);
 
-                if (sfConfig::get('sf_logging_enabled')) {
-                    $this->context->getEventDispatcher()->notify(new sfEvent($this, 'application.log', array('ETag matches If-None-Match (send 304)')));
+                if (\sfConfig::get('sf_logging_enabled')) {
+                    $this->context->getEventDispatcher()->notify(new \sfEvent($this, 'application.log', ['ETag matches If-None-Match (send 304)']));
                 }
             }
         }
 
         // conditional GET support
         // never in debug mode
-        if ($this->response->hasHttpHeader('Last-Modified') && (!sfConfig::get('sf_debug') || sfConfig::get('sf_test'))) {
+        if ($this->response->hasHttpHeader('Last-Modified') && (!\sfConfig::get('sf_debug') || \sfConfig::get('sf_test'))) {
             $lastModified = $this->response->getHttpHeader('Last-Modified');
             if ($this->request->getHttpHeader('IF_MODIFIED_SINCE') == $lastModified) {
                 $this->response->setStatusCode(304);
                 $this->response->setHeaderOnly(true);
 
-                if (sfConfig::get('sf_logging_enabled')) {
-                    $this->context->getEventDispatcher()->notify(new sfEvent($this, 'application.log', array('Last-Modified matches If-Modified-Since (send 304)')));
+                if (\sfConfig::get('sf_logging_enabled')) {
+                    $this->context->getEventDispatcher()->notify(new \sfEvent($this, 'application.log', ['Last-Modified matches If-Modified-Since (send 304)']));
                 }
             }
         }
diff --git a/lib/filter/sfCommonFilter.class.php b/lib/filter/sfCommonFilter.class.php
index c308633f7..5544ca019 100644
--- a/lib/filter/sfCommonFilter.class.php
+++ b/lib/filter/sfCommonFilter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,12 +16,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfCommonFilter extends sfFilter
+class sfCommonFilter extends \sfFilter
 {
     /**
      * Executes this filter.
      *
-     * @param sfFilterChain $filterChain A sfFilterChain instance
+     * @param \sfFilterChain $filterChain A sfFilterChain instance
      */
     public function execute($filterChain)
     {
@@ -33,12 +34,12 @@ public function execute($filterChain)
         // include javascripts and stylesheets
         $content = $response->getContent();
         if (false !== ($pos = strpos($content, '</head>'))) {
-            $this->context->getConfiguration()->loadHelpers(array('Tag', 'Asset'));
+            $this->context->getConfiguration()->loadHelpers(['Tag', 'Asset']);
             $html = '';
-            if (!sfConfig::get('symfony.asset.javascripts_included', false)) {
+            if (!\sfConfig::get('symfony.asset.javascripts_included', false)) {
                 $html .= get_javascripts($response);
             }
-            if (!sfConfig::get('symfony.asset.stylesheets_included', false)) {
+            if (!\sfConfig::get('symfony.asset.stylesheets_included', false)) {
                 $html .= get_stylesheets($response);
             }
 
@@ -47,7 +48,7 @@ public function execute($filterChain)
             }
         }
 
-        sfConfig::set('symfony.asset.javascripts_included', false);
-        sfConfig::set('symfony.asset.stylesheets_included', false);
+        \sfConfig::set('symfony.asset.javascripts_included', false);
+        \sfConfig::set('symfony.asset.stylesheets_included', false);
     }
 }
diff --git a/lib/filter/sfExecutionFilter.class.php b/lib/filter/sfExecutionFilter.class.php
index 0d79771e5..e704492df 100644
--- a/lib/filter/sfExecutionFilter.class.php
+++ b/lib/filter/sfExecutionFilter.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,30 +18,30 @@
  *
  * @version    SVN: $Id$
  */
-class sfExecutionFilter extends sfFilter
+class sfExecutionFilter extends \sfFilter
 {
     /**
      * Executes this filter.
      *
-     * @param sfFilterChain $filterChain The filter chain
+     * @param \sfFilterChain $filterChain The filter chain
      *
-     * @throws sfInitializeException If an error occurs during view initialization
-     * @throws sfViewException       If an error occurs while executing the view
+     * @throws \sfInitializeException If an error occurs during view initialization
+     * @throws \sfViewException       If an error occurs while executing the view
      */
     public function execute($filterChain)
     {
         // get the current action instance
-        /** @var sfAction $actionInstance */
+        /** @var \sfAction $actionInstance */
         $actionInstance = $this->context->getController()->getActionStack()->getLastEntry()->getActionInstance();
 
         // execute the action, execute and render the view
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
-            $timer = sfTimerManager::getTimer(sprintf('Action "%s/%s"', $actionInstance->getModuleName(), $actionInstance->getActionName()));
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
+            $timer = \sfTimerManager::getTimer(sprintf('Action "%s/%s"', $actionInstance->getModuleName(), $actionInstance->getActionName()));
 
             $viewName = $this->handleAction($filterChain, $actionInstance);
 
             $timer->addTime();
-            $timer = sfTimerManager::getTimer(sprintf('View "%s" for "%s/%s"', $viewName, $actionInstance->getModuleName(), $actionInstance->getActionName()));
+            $timer = \sfTimerManager::getTimer(sprintf('View "%s" for "%s/%s"', $viewName, $actionInstance->getModuleName(), $actionInstance->getActionName()));
 
             $this->handleView($filterChain, $actionInstance, $viewName);
 
@@ -55,18 +55,18 @@ public function execute($filterChain)
     /**
      * Handles the action.
      *
-     * @param sfFilterChain $filterChain    The current filter chain
-     * @param sfAction      $actionInstance An sfAction instance
+     * @param \sfFilterChain $filterChain    The current filter chain
+     * @param \sfAction      $actionInstance An sfAction instance
      *
      * @return string The view type
      */
     protected function handleAction($filterChain, $actionInstance)
     {
-        if (sfConfig::get('sf_cache')) {
+        if (\sfConfig::get('sf_cache')) {
             $uri = $this->context->getViewCacheManager()->getCurrentCacheKey();
             if (null !== $uri && $this->context->getViewCacheManager()->hasActionCache($uri)) {
                 // action in cache, so go to the view
-                return sfView::SUCCESS;
+                return \sfView::SUCCESS;
             }
         }
 
@@ -76,7 +76,7 @@ protected function handleAction($filterChain, $actionInstance)
     /**
      * Executes the execute method of an action.
      *
-     * @param sfAction $actionInstance An sfAction instance
+     * @param \sfAction $actionInstance An sfAction instance
      *
      * @return string The view type
      */
@@ -87,25 +87,25 @@ protected function executeAction($actionInstance)
         $viewName = $actionInstance->execute($this->context->getRequest());
         $actionInstance->postExecute();
 
-        return null === $viewName ? sfView::SUCCESS : $viewName;
+        return null === $viewName ? \sfView::SUCCESS : $viewName;
     }
 
     /**
      * Handles the view.
      *
-     * @param sfFilterChain $filterChain    The current filter chain
-     * @param sfAction      $actionInstance An sfAction instance
-     * @param string        $viewName       The view name
+     * @param \sfFilterChain $filterChain    The current filter chain
+     * @param \sfAction      $actionInstance An sfAction instance
+     * @param string         $viewName       The view name
      */
     protected function handleView($filterChain, $actionInstance, $viewName)
     {
         switch ($viewName) {
-            case sfView::HEADER_ONLY:
+            case \sfView::HEADER_ONLY:
                 $this->context->getResponse()->setHeaderOnly(true);
 
                 return;
 
-            case sfView::NONE:
+            case \sfView::NONE:
                 return;
         }
 
@@ -143,16 +143,16 @@ protected function executeView($moduleName, $actionName, $viewName, $viewAttribu
 
         // render the view
         switch ($controller->getRenderMode()) {
-            case sfView::RENDER_NONE:
+            case \sfView::RENDER_NONE:
                 break;
 
-            case sfView::RENDER_CLIENT:
+            case \sfView::RENDER_CLIENT:
                 $viewData = $view->render();
                 $this->context->getResponse()->setContent($viewData);
 
                 break;
 
-            case sfView::RENDER_VAR:
+            case \sfView::RENDER_VAR:
                 $viewData = $view->render();
                 $controller->getActionStack()->getLastEntry()->setPresentation($viewData);
 
diff --git a/lib/filter/sfFilter.class.php b/lib/filter/sfFilter.class.php
index 81dc19cb5..f761221a9 100644
--- a/lib/filter/sfFilter.class.php
+++ b/lib/filter/sfFilter.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,12 +20,12 @@
 abstract class sfFilter
 {
     /** @var bool[] */
-    public static $filterCalled = array();
+    public static $filterCalled = [];
 
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $parameterHolder;
 
-    /** @var sfContext */
+    /** @var \sfContext */
     protected $context;
 
     /**
@@ -33,10 +33,10 @@ abstract class sfFilter
      *
      * @see initialize()
      *
-     * @param sfContext $context
-     * @param array     $parameters
+     * @param \sfContext $context
+     * @param array      $parameters
      */
-    public function __construct($context, $parameters = array())
+    public function __construct($context, $parameters = [])
     {
         $this->initialize($context, $parameters);
     }
@@ -44,16 +44,16 @@ public function __construct($context, $parameters = array())
     /**
      * Initializes this Filter.
      *
-     * @param sfContext $context    The current application context
-     * @param array     $parameters An associative array of initialization parameters
+     * @param \sfContext $context    The current application context
+     * @param array      $parameters An associative array of initialization parameters
      *
      * @return bool|void true
      */
-    public function initialize($context, $parameters = array())
+    public function initialize($context, $parameters = [])
     {
         $this->context = $context;
 
-        $this->parameterHolder = new sfParameterHolder();
+        $this->parameterHolder = new \sfParameterHolder();
         $this->parameterHolder->add($parameters);
 
         return true;
@@ -62,7 +62,7 @@ public function initialize($context, $parameters = array())
     /**
      * Retrieves the current application context.
      *
-     * @return sfContext The current sfContext instance
+     * @return \sfContext The current sfContext instance
      */
     final public function getContext()
     {
@@ -72,7 +72,7 @@ final public function getContext()
     /**
      * Gets the parameter holder for this object.
      *
-     * @return sfParameterHolder A sfParameterHolder instance
+     * @return \sfParameterHolder A sfParameterHolder instance
      */
     public function getParameterHolder()
     {
@@ -91,7 +91,7 @@ public function getParameterHolder()
      *
      * @return string The value associated with the key
      *
-     * @see sfParameterHolder
+     * @see \sfParameterHolder
      */
     public function getParameter($name, $default = null)
     {
@@ -109,7 +109,7 @@ public function getParameter($name, $default = null)
      *
      * @return bool true if the given key exists, false otherwise
      *
-     * @see sfParameterHolder
+     * @see \sfParameterHolder
      */
     public function hasParameter($name)
     {
@@ -126,7 +126,7 @@ public function hasParameter($name)
      * @param string $name  The key name
      * @param string $value The value
      *
-     * @see sfParameterHolder
+     * @see \sfParameterHolder
      */
     public function setParameter($name, $value)
     {
diff --git a/lib/filter/sfFilterChain.class.php b/lib/filter/sfFilterChain.class.php
index 2cdaec93e..46cfa488c 100644
--- a/lib/filter/sfFilterChain.class.php
+++ b/lib/filter/sfFilterChain.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  */
 class sfFilterChain
 {
-    protected $chain = array();
+    protected $chain = [];
     protected $index = -1;
 
     /**
      * Loads filters configuration for a given action instance.
      *
-     * @param sfComponent $actionInstance A sfComponent instance
+     * @param \sfComponent $actionInstance A sfComponent instance
      */
     public function loadConfiguration($actionInstance)
     {
-        require sfContext::getInstance()->getConfigCache()->checkConfig('modules/'.$actionInstance->getModuleName().'/config/filters.yml');
+        require \sfContext::getInstance()->getConfigCache()->checkConfig('modules/'.$actionInstance->getModuleName().'/config/filters.yml');
     }
 
     /**
@@ -41,8 +41,8 @@ public function execute()
         ++$this->index;
 
         if ($this->index < count($this->chain)) {
-            if (sfConfig::get('sf_logging_enabled')) {
-                sfContext::getInstance()->getEventDispatcher()->notify(new sfEvent($this, 'application.log', array(sprintf('Executing filter "%s"', get_class($this->chain[$this->index])))));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                \sfContext::getInstance()->getEventDispatcher()->notify(new \sfEvent($this, 'application.log', [sprintf('Executing filter "%s"', get_class($this->chain[$this->index]))]));
             }
 
             // execute the next filter
@@ -71,7 +71,7 @@ public function hasFilter($class)
     /**
      * Registers a filter with this chain.
      *
-     * @param sfFilter $filter a sfFilter implementation instance
+     * @param \sfFilter $filter a sfFilter implementation instance
      */
     public function register($filter)
     {
diff --git a/lib/filter/sfRenderingFilter.class.php b/lib/filter/sfRenderingFilter.class.php
index e4175fe61..5e48ce1c2 100644
--- a/lib/filter/sfRenderingFilter.class.php
+++ b/lib/filter/sfRenderingFilter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,15 +17,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfRenderingFilter extends sfFilter
+class sfRenderingFilter extends \sfFilter
 {
     /**
      * Executes this filter.
      *
-     * @param sfFilterChain $filterChain the filter chain
+     * @param \sfFilterChain $filterChain the filter chain
      *
-     * @throws sfInitializeException If an error occurs during view initialization
-     * @throws sfViewException       If an error occurs while executing the view
+     * @throws \sfInitializeException If an error occurs during view initialization
+     * @throws \sfViewException       If an error occurs while executing the view
      */
     public function execute($filterChain)
     {
@@ -35,15 +36,15 @@ public function execute($filterChain)
         $response = $this->context->getResponse();
 
         // hack to rethrow sfForm and|or sfFormField __toString() exceptions (see sfForm and sfFormField)
-        if (sfForm::hasToStringException()) {
-            throw sfForm::getToStringException();
+        if (\sfForm::hasToStringException()) {
+            throw \sfForm::getToStringException();
         }
-        if (sfFormField::hasToStringException()) {
-            throw sfFormField::getToStringException();
+        if (\sfFormField::hasToStringException()) {
+            throw \sfFormField::getToStringException();
         }
 
         // send headers + content
-        if (sfView::RENDER_VAR != $this->context->getController()->getRenderMode()) {
+        if (\sfView::RENDER_VAR != $this->context->getController()->getRenderMode()) {
             $response->send();
         }
     }
diff --git a/lib/form/addon/sfFormFilter.class.php b/lib/form/addon/sfFormFilter.class.php
index 24be7b5bf..f20aca021 100644
--- a/lib/form/addon/sfFormFilter.class.php
+++ b/lib/form/addon/sfFormFilter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfFormFilter extends BaseForm
+class sfFormFilter extends \BaseForm
 {
 }
diff --git a/lib/form/addon/sfFormObject.class.php b/lib/form/addon/sfFormObject.class.php
index 1b85fa003..055192848 100644
--- a/lib/form/addon/sfFormObject.class.php
+++ b/lib/form/addon/sfFormObject.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfFormObject extends BaseForm
+abstract class sfFormObject extends \BaseForm
 {
     protected $isNew = true;
     protected $object;
@@ -93,8 +94,8 @@ public function bindAndSave($taintedValues, $taintedFiles = null, $con = null)
      *
      * @return mixed The current saved object
      *
-     * @throws Exception
-     * @throws sfValidatorErrorSchema
+     * @throws \Exception
+     * @throws \sfValidatorErrorSchema
      *
      * @see doSave()
      */
@@ -114,7 +115,7 @@ public function save($con = null)
             $this->doSave($con);
 
             $con->commit();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $con->rollBack();
 
             throw $e;
@@ -180,7 +181,7 @@ public function updateObjectEmbeddedForms($values, $forms = null)
                 continue;
             }
 
-            if ($form instanceof sfFormObject) {
+            if ($form instanceof \sfFormObject) {
                 $form->updateObject($values[$name]);
             } else {
                 $this->updateObjectEmbeddedForms($values[$name], $form->getEmbeddedForms());
@@ -205,7 +206,7 @@ public function saveObjectEmbeddedForms($con = null, $forms = null)
         }
 
         foreach ($forms as $form) {
-            if ($form instanceof sfFormObject) {
+            if ($form instanceof \sfFormObject) {
                 $form->saveObject($con);
             } else {
                 $this->saveObjectEmbeddedForms($con, $form->getEmbeddedForms());
@@ -226,9 +227,9 @@ public function saveObjectEmbeddedForms($con = null, $forms = null)
      *
      * @return string An HTML representation of the opening form tag
      *
-     * @see sfForm
+     * @see \sfForm
      */
-    public function renderFormTag($url, array $attributes = array())
+    public function renderFormTag($url, array $attributes = [])
     {
         if (!isset($attributes['method'])) {
             $attributes['method'] = $this->isNew() ? 'post' : 'put';
@@ -263,6 +264,6 @@ protected function doSave($con = null)
 
     protected function camelize($text)
     {
-        return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+        return strtr(ucwords(strtr($text, ['/' => ':: ', '_' => ' ', '-' => ' '])), [' ' => '']);
     }
 }
diff --git a/lib/form/addon/sfFormSymfony.class.php b/lib/form/addon/sfFormSymfony.class.php
index b352fa672..499b02daf 100644
--- a/lib/form/addon/sfFormSymfony.class.php
+++ b/lib/form/addon/sfFormSymfony.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfFormSymfony extends sfForm
+class sfFormSymfony extends \sfForm
 {
-    /** @var sfEventDispatcher|null */
+    /** @var \sfEventDispatcher|null */
     protected static $dispatcher;
 
     /**
@@ -25,16 +26,16 @@ class sfFormSymfony extends sfForm
      *
      * Notifies the 'form.post_configure' event.
      *
-     * @see sfForm
+     * @see \sfForm
      *
-     * @param mixed|null $CSRFSecret
+     * @param \mixed|null $CSRFSecret
      */
-    public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
+    public function __construct($defaults = [], $options = [], $CSRFSecret = null)
     {
         parent::__construct($defaults, $options, $CSRFSecret);
 
         if (self::$dispatcher) {
-            self::$dispatcher->notify(new sfEvent($this, 'form.post_configure'));
+            self::$dispatcher->notify(new \sfEvent($this, 'form.post_configure'));
         }
     }
 
@@ -46,24 +47,24 @@ public function __construct($defaults = array(), $options = array(), $CSRFSecret
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function __call($method, $arguments)
     {
         if (self::$dispatcher) {
-            $event = self::$dispatcher->notifyUntil(new sfEvent($this, 'form.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+            $event = self::$dispatcher->notifyUntil(new \sfEvent($this, 'form.method_not_found', ['method' => $method, 'arguments' => $arguments]));
             if ($event->isProcessed()) {
                 return $event->getReturnValue();
             }
         }
 
-        throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+        throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
     }
 
     /**
      * Sets the event dispatcher to be used by all forms.
      */
-    public static function setEventDispatcher(sfEventDispatcher $dispatcher = null)
+    public static function setEventDispatcher(\sfEventDispatcher $dispatcher = null)
     {
         self::$dispatcher = $dispatcher;
     }
@@ -71,7 +72,7 @@ public static function setEventDispatcher(sfEventDispatcher $dispatcher = null)
     /**
      * Returns the event dispatcher.
      *
-     * @return sfEventDispatcher
+     * @return \sfEventDispatcher
      */
     public static function getEventDispatcher()
     {
@@ -81,19 +82,19 @@ public static function getEventDispatcher()
     /**
      * Notifies the 'form.filter_values' and 'form.validation_error' events.
      *
-     * @see sfForm
+     * @see \sfForm
      */
     protected function doBind(array $values)
     {
         if (self::$dispatcher) {
-            $values = self::$dispatcher->filter(new sfEvent($this, 'form.filter_values'), $values)->getReturnValue();
+            $values = self::$dispatcher->filter(new \sfEvent($this, 'form.filter_values'), $values)->getReturnValue();
         }
 
         try {
             parent::doBind($values);
-        } catch (sfValidatorError $error) {
+        } catch (\sfValidatorError $error) {
             if (self::$dispatcher) {
-                self::$dispatcher->notify(new sfEvent($this, 'form.validation_error', array('error' => $error)));
+                self::$dispatcher->notify(new \sfEvent($this, 'form.validation_error', ['error' => $error]));
             }
 
             throw $error;
diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
index 5da563636..c7ac73812 100644
--- a/lib/form/sfForm.class.php
+++ b/lib/form/sfForm.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,7 +25,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfForm implements ArrayAccess, Iterator, Countable
+class sfForm implements \ArrayAccess, \Iterator, \Countable
 {
     protected static $CSRFSecret = false;
     protected static $CSRFFieldName = '_csrf_token';
@@ -39,23 +40,23 @@ class sfForm implements ArrayAccess, Iterator, Countable
     /** @var sfValidatorError[]|sfValidatorErrorSchema */
     protected $errorSchema;
 
-    /** @var sfFormFieldSchema|null */
+    /** @var \sfFormFieldSchema|null */
     protected $formFieldSchema;
 
     /** @var sfFormField[] */
-    protected $formFields = array();
+    protected $formFields = [];
     protected $isBound = false;
-    protected $taintedValues = array();
-    protected $taintedFiles = array();
-    protected $values = array();
-    protected $defaults = array();
-    protected $fieldNames = array();
-    protected $options = array();
+    protected $taintedValues = [];
+    protected $taintedFiles = [];
+    protected $values = [];
+    protected $defaults = [];
+    protected $fieldNames = [];
+    protected $options = [];
     protected $count = 0;
     protected $localCSRFSecret;
 
     /** @var sfForm[] */
-    protected $embeddedForms = array();
+    protected $embeddedForms = [];
 
     /**
      * Constructor.
@@ -64,14 +65,14 @@ class sfForm implements ArrayAccess, Iterator, Countable
      * @param array  $options    An array of options
      * @param string $CSRFSecret A CSRF secret
      */
-    public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
+    public function __construct($defaults = [], $options = [], $CSRFSecret = null)
     {
         $this->options = $options;
         $this->localCSRFSecret = $CSRFSecret;
 
-        $this->validatorSchema = new sfValidatorSchema();
-        $this->widgetSchema = new sfWidgetFormSchema();
-        $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
+        $this->validatorSchema = new \sfValidatorSchema();
+        $this->widgetSchema = new \sfWidgetFormSchema();
+        $this->errorSchema = new \sfValidatorErrorSchema($this->validatorSchema);
 
         $this->setDefaults($defaults);
         $this->setup();
@@ -92,7 +93,7 @@ public function __toString()
     {
         try {
             return $this->render();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             self::setToStringException($e);
 
             // we return a simple Exception message in case the form framework is used out of symfony.
@@ -138,7 +139,7 @@ public function configure()
      *
      * @return string The rendered widget schema
      */
-    public function render($attributes = array())
+    public function render($attributes = [])
     {
         return $this->getFormFieldSchema()->render($attributes);
     }
@@ -151,7 +152,7 @@ public function render($attributes = array())
      *
      * @return string The rendered widget schema
      */
-    public function renderUsing($formatterName, $attributes = array())
+    public function renderUsing($formatterName, $attributes = [])
     {
         $currentFormatterName = $this->widgetSchema->getFormFormatterName();
 
@@ -171,7 +172,7 @@ public function renderUsing($formatterName, $attributes = array())
      *
      * @return string
      *
-     * @see sfFormFieldSchema
+     * @see \sfFormFieldSchema
      */
     public function renderHiddenFields($recursive = true)
     {
@@ -224,27 +225,27 @@ public function bind(array $taintedValues = null, array $taintedFiles = null)
         $this->resetFormFields();
 
         if (null === $this->taintedValues) {
-            $this->taintedValues = array();
+            $this->taintedValues = [];
         }
 
         if (null === $this->taintedFiles) {
             if ($this->isMultipart()) {
-                throw new InvalidArgumentException('This form is multipart, which means you need to supply a files array as the bind() method second argument.');
+                throw new \InvalidArgumentException('This form is multipart, which means you need to supply a files array as the bind() method second argument.');
             }
 
-            $this->taintedFiles = array();
+            $this->taintedFiles = [];
         }
 
         $this->checkTaintedValues($this->taintedValues);
 
         try {
             $this->doBind(self::deepArrayUnion($this->taintedValues, self::convertFileInformation($this->taintedFiles)));
-            $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
+            $this->errorSchema = new \sfValidatorErrorSchema($this->validatorSchema);
 
             // remove CSRF token
             unset($this->values[self::$CSRFFieldName]);
-        } catch (sfValidatorErrorSchema $e) {
-            $this->values = array();
+        } catch (\sfValidatorErrorSchema $e) {
+            $this->values = [];
             $this->errorSchema = $e;
         }
 
@@ -264,8 +265,8 @@ public function bindEmbeddedForms(array $taintedValues = null, array $taintedFil
 
             // bind
             $form->bind(
-                isset($taintedValues[$name]) ? $taintedValues[$name] : array(),
-                isset($taintedFiles[$name]) ? $taintedFiles[$name] : array()
+                isset($taintedValues[$name]) ? $taintedValues[$name] : [],
+                isset($taintedFiles[$name]) ? $taintedFiles[$name] : []
             );
 
             // set values for current form
@@ -274,7 +275,7 @@ public function bindEmbeddedForms(array $taintedValues = null, array $taintedFil
             // set widget schema for current form
             $widgetSchema = $form->getWidgetSchema();
             $decorator = $widgetSchema->getFormFormatter()->getDecoratorFormat();
-            $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
+            $this->widgetSchema[$name] = new \sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
 
             // keep widgetSchema synchronized
             $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
@@ -329,7 +330,7 @@ public function updateValuesEmbeddedForms(array $values)
     public function getTaintedValues()
     {
         if (!$this->isBound) {
-            return array();
+            return [];
         }
 
         return $this->taintedValues;
@@ -376,7 +377,7 @@ public function hasErrors()
      */
     public function getValues()
     {
-        return $this->isBound ? $this->values : array();
+        return $this->isBound ? $this->values : [];
     }
 
     /**
@@ -412,7 +413,7 @@ public function getName()
     /**
      * Gets the error schema associated with the form.
      *
-     * @return sfValidatorErrorSchema A sfValidatorErrorSchema instance
+     * @return \sfValidatorErrorSchema A sfValidatorErrorSchema instance
      */
     public function getErrorSchema()
     {
@@ -422,15 +423,15 @@ public function getErrorSchema()
     /**
      * Embeds a sfForm into the current form.
      *
-     * @param string $name      The field name
-     * @param sfForm $form      A sfForm instance
-     * @param string $decorator A HTML decorator for the embedded form
+     * @param string  $name      The field name
+     * @param \sfForm $form      A sfForm instance
+     * @param string  $decorator A HTML decorator for the embedded form
      */
-    public function embedForm($name, sfForm $form, $decorator = null)
+    public function embedForm($name, \sfForm $form, $decorator = null)
     {
         $name = (string) $name;
         if (true === $this->isBound() || true === $form->isBound()) {
-            throw new LogicException('A bound form cannot be embedded');
+            throw new \LogicException('A bound form cannot be embedded');
         }
 
         unset($form[self::$CSRFFieldName]);
@@ -443,8 +444,8 @@ public function embedForm($name, sfForm $form, $decorator = null)
 
         $decorator = null === $decorator ? $widgetSchema->getFormFormatter()->getDecoratorFormat() : $decorator;
 
-        $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
-        $this->validatorSchema[$name] = new sfValidatorPass();
+        $this->widgetSchema[$name] = new \sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
+        $this->validatorSchema[$name] = new \sfValidatorPass();
 
         // keep widgetSchema synchronized
         $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
@@ -467,14 +468,14 @@ public function getEmbeddedForms()
      *
      * @param string $name The name used to embed the form
      *
-     * @return sfForm
+     * @return \sfForm
      *
-     * @throws InvalidArgumentException If there is no form embedded with the supplied name
+     * @throws \InvalidArgumentException If there is no form embedded with the supplied name
      */
     public function getEmbeddedForm($name)
     {
         if (!isset($this->embeddedForms[$name])) {
-            throw new InvalidArgumentException(sprintf('There is no embedded "%s" form.', $name));
+            throw new \InvalidArgumentException(sprintf('There is no embedded "%s" form.', $name));
         }
 
         return $this->embeddedForms[$name];
@@ -484,14 +485,14 @@ public function getEmbeddedForm($name)
      * Merges current form widget and validator schemas with the ones from the
      * sfForm object passed as parameter. Please note it also merge defaults.
      *
-     * @param sfForm $form The sfForm instance to merge with current form
+     * @param \sfForm $form The sfForm instance to merge with current form
      *
-     * @throws LogicException If one of the form has already been bound
+     * @throws \LogicException If one of the form has already been bound
      */
-    public function mergeForm(sfForm $form)
+    public function mergeForm(\sfForm $form)
     {
         if (true === $this->isBound() || true === $form->isBound()) {
-            throw new LogicException('A bound form cannot be merged');
+            throw new \LogicException('A bound form cannot be merged');
         }
 
         $form = clone $form;
@@ -519,9 +520,9 @@ public function mergeForm(sfForm $form)
     /**
      * Merges a validator with the current pre validators.
      *
-     * @param sfValidatorBase $validator A validator to be merged
+     * @param \sfValidatorBase $validator A validator to be merged
      */
-    public function mergePreValidator(sfValidatorBase $validator = null)
+    public function mergePreValidator(\sfValidatorBase $validator = null)
     {
         if (null === $validator) {
             return;
@@ -530,19 +531,19 @@ public function mergePreValidator(sfValidatorBase $validator = null)
         if (null === $this->validatorSchema->getPreValidator()) {
             $this->validatorSchema->setPreValidator($validator);
         } else {
-            $this->validatorSchema->setPreValidator(new sfValidatorAnd(array(
+            $this->validatorSchema->setPreValidator(new \sfValidatorAnd([
                 $this->validatorSchema->getPreValidator(),
                 $validator,
-            )));
+            ]));
         }
     }
 
     /**
      * Merges a validator with the current post validators.
      *
-     * @param sfValidatorBase $validator A validator to be merged
+     * @param \sfValidatorBase $validator A validator to be merged
      */
-    public function mergePostValidator(sfValidatorBase $validator = null)
+    public function mergePostValidator(\sfValidatorBase $validator = null)
     {
         if (null === $validator) {
             return;
@@ -551,10 +552,10 @@ public function mergePostValidator(sfValidatorBase $validator = null)
         if (null === $this->validatorSchema->getPostValidator()) {
             $this->validatorSchema->setPostValidator($validator);
         } else {
-            $this->validatorSchema->setPostValidator(new sfValidatorAnd(array(
+            $this->validatorSchema->setPostValidator(new \sfValidatorAnd([
                 $this->validatorSchema->getPostValidator(),
                 $validator,
-            )));
+            ]));
         }
     }
 
@@ -563,11 +564,11 @@ public function mergePostValidator(sfValidatorBase $validator = null)
      *
      * @param array $validators An array of named validators
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
     public function setValidators(array $validators)
     {
-        $this->setValidatorSchema(new sfValidatorSchema($validators));
+        $this->setValidatorSchema(new \sfValidatorSchema($validators));
 
         return $this;
     }
@@ -575,15 +576,15 @@ public function setValidators(array $validators)
     /**
      * Set a validator for the given field name.
      *
-     * @param string          $name      The field name
-     * @param sfValidatorBase $validator The validator
+     * @param string           $name      The field name
+     * @param \sfValidatorBase $validator The validator
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
-    public function setValidator($name, sfValidatorBase $validator)
+    public function setValidator($name, \sfValidatorBase $validator)
     {
         if (isset($this->embeddedForms[$name])) {
-            throw new LogicException('You cannot set a validator for an embedded form.');
+            throw new \LogicException('You cannot set a validator for an embedded form.');
         }
 
         $this->validatorSchema[$name] = $validator;
@@ -598,12 +599,12 @@ public function setValidator($name, sfValidatorBase $validator)
      *
      * @param string $name The field name
      *
-     * @return sfValidatorBase $validator The validator
+     * @return \sfValidatorBase $validator The validator
      */
     public function getValidator($name)
     {
         if (!isset($this->validatorSchema[$name])) {
-            throw new InvalidArgumentException(sprintf('The validator "%s" does not exist.', $name));
+            throw new \InvalidArgumentException(sprintf('The validator "%s" does not exist.', $name));
         }
 
         if (isset($this->embeddedForms[$name])) {
@@ -616,11 +617,11 @@ public function getValidator($name)
     /**
      * Sets the validator schema associated with this form.
      *
-     * @param sfValidatorSchema $validatorSchema A sfValidatorSchema instance
+     * @param \sfValidatorSchema $validatorSchema A sfValidatorSchema instance
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
-    public function setValidatorSchema(sfValidatorSchema $validatorSchema)
+    public function setValidatorSchema(\sfValidatorSchema $validatorSchema)
     {
         $this->validatorSchema = $validatorSchema;
 
@@ -632,7 +633,7 @@ public function setValidatorSchema(sfValidatorSchema $validatorSchema)
     /**
      * Gets the validator schema associated with this form.
      *
-     * @return sfValidatorSchema A sfValidatorSchema instance
+     * @return \sfValidatorSchema A sfValidatorSchema instance
      */
     public function getValidatorSchema()
     {
@@ -644,11 +645,11 @@ public function getValidatorSchema()
      *
      * @param array $widgets An array of named widgets
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
     public function setWidgets(array $widgets)
     {
-        $this->setWidgetSchema(new sfWidgetFormSchema($widgets));
+        $this->setWidgetSchema(new \sfWidgetFormSchema($widgets));
 
         return $this;
     }
@@ -656,12 +657,12 @@ public function setWidgets(array $widgets)
     /**
      * Set a widget for the given field name.
      *
-     * @param string       $name   The field name
-     * @param sfWidgetForm $widget The widget
+     * @param string        $name   The field name
+     * @param \sfWidgetForm $widget The widget
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
-    public function setWidget($name, sfWidgetForm $widget)
+    public function setWidget($name, \sfWidgetForm $widget)
     {
         $this->widgetSchema[$name] = $widget;
 
@@ -675,12 +676,12 @@ public function setWidget($name, sfWidgetForm $widget)
      *
      * @param string $name The field name
      *
-     * @return sfWidgetForm $widget The widget
+     * @return \sfWidgetForm $widget The widget
      */
     public function getWidget($name)
     {
         if (!isset($this->widgetSchema[$name])) {
-            throw new InvalidArgumentException(sprintf('The widget "%s" does not exist.', $name));
+            throw new \InvalidArgumentException(sprintf('The widget "%s" does not exist.', $name));
         }
 
         return $this->widgetSchema[$name];
@@ -689,11 +690,11 @@ public function getWidget($name)
     /**
      * Sets the widget schema associated with this form.
      *
-     * @param sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
+     * @param \sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
-    public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
+    public function setWidgetSchema(\sfWidgetFormSchema $widgetSchema)
     {
         $this->widgetSchema = $widgetSchema;
 
@@ -705,7 +706,7 @@ public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
     /**
      * Gets the widget schema associated with this form.
      *
-     * @return sfWidgetFormSchema A sfWidgetFormSchema instance
+     * @return \sfWidgetFormSchema A sfWidgetFormSchema instance
      */
     public function getWidgetSchema()
     {
@@ -748,7 +749,7 @@ public function getOptions()
      * @param string $name  The option name
      * @param mixed  $value The default value
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
     public function setOption($name, $value)
     {
@@ -774,7 +775,7 @@ public function getOption($name, $default = null)
      * @param string $name    The field name
      * @param mixed  $default The default value
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
     public function setDefault($name, $default)
     {
@@ -816,11 +817,11 @@ public function hasDefault($name)
      *
      * @param array $defaults An array of default values
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
     public function setDefaults($defaults)
     {
-        $this->defaults = null === $defaults ? array() : $defaults;
+        $this->defaults = null === $defaults ? [] : $defaults;
 
         if ($this->isCSRFProtected()) {
             $this->setDefault(self::$CSRFFieldName, $this->getCSRFToken($this->localCSRFSecret ?: self::$CSRFSecret));
@@ -846,7 +847,7 @@ public function getDefaults()
      *
      * @param string $secret The secret to use to compute the CSRF token
      *
-     * @return sfForm The current form instance
+     * @return \sfForm The current form instance
      */
     public function addCSRFProtection($secret = null)
     {
@@ -868,8 +869,8 @@ public function addCSRFProtection($secret = null)
 
         $token = $this->getCSRFToken($secret);
 
-        $this->validatorSchema[self::$CSRFFieldName] = new sfValidatorCSRFToken(array('token' => $token));
-        $this->widgetSchema[self::$CSRFFieldName] = new sfWidgetFormInputHidden();
+        $this->validatorSchema[self::$CSRFFieldName] = new \sfValidatorCSRFToken(['token' => $token]);
+        $this->widgetSchema[self::$CSRFFieldName] = new \sfWidgetFormInputHidden();
         $this->setDefault(self::$CSRFFieldName, $token);
 
         return $this;
@@ -987,7 +988,7 @@ public function isMultipart()
      *
      * @return string An HTML representation of the opening form tag
      */
-    public function renderFormTag($url, array $attributes = array())
+    public function renderFormTag($url, array $attributes = [])
     {
         $attributes['action'] = $url;
         $attributes['method'] = isset($attributes['method']) ? strtolower($attributes['method']) : 'post';
@@ -996,8 +997,8 @@ public function renderFormTag($url, array $attributes = array())
         }
 
         $html = '';
-        if (!in_array($attributes['method'], array('get', 'post'))) {
-            $html = $this->getWidgetSchema()->renderTag('input', array('type' => 'hidden', 'name' => 'sf_method', 'value' => $attributes['method'], 'id' => false));
+        if (!in_array($attributes['method'], ['get', 'post'])) {
+            $html = $this->getWidgetSchema()->renderTag('input', ['type' => 'hidden', 'name' => 'sf_method', 'value' => $attributes['method'], 'id' => false]);
             $attributes['method'] = 'post';
         }
 
@@ -1006,7 +1007,7 @@ public function renderFormTag($url, array $attributes = array())
 
     public function resetFormFields()
     {
-        $this->formFields = array();
+        $this->formFields = [];
         $this->formFieldSchema = null;
     }
 
@@ -1035,7 +1036,7 @@ public function offsetGet($name)
     {
         if (!isset($this->formFields[$name])) {
             if (!$widget = $this->widgetSchema[$name]) {
-                throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
+                throw new \InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
             }
 
             if ($this->isBound) {
@@ -1043,10 +1044,10 @@ public function offsetGet($name)
             } elseif (isset($this->defaults[$name])) {
                 $value = $this->defaults[$name];
             } else {
-                $value = $widget instanceof sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
+                $value = $widget instanceof \sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
             }
 
-            $class = $widget instanceof sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField';
+            $class = $widget instanceof \sfWidgetFormSchema ? 'sfFormFieldSchema' : 'sfFormField';
 
             $this->formFields[$name] = new $class($widget, $this->getFormFieldSchema(), $name, $value, $this->errorSchema[$name]);
         }
@@ -1060,12 +1061,12 @@ public function offsetGet($name)
      * @param string $offset (ignored)
      * @param string $value  (ignored)
      *
-     * @throws LogicException
+     * @throws \LogicException
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        throw new LogicException('Cannot update form fields.');
+        throw new \LogicException('Cannot update form fields.');
     }
 
     /**
@@ -1098,9 +1099,9 @@ public function offsetUnset($offset)
      * @param array $fields  An array of field names
      * @param bool  $ordered Whether to use the array of field names to reorder the fields
      */
-    public function useFields(array $fields = array(), $ordered = true)
+    public function useFields(array $fields = [], $ordered = true)
     {
-        $hidden = array();
+        $hidden = [];
 
         foreach ($this as $name => $field) {
             if ($field->isHidden()) {
@@ -1118,14 +1119,14 @@ public function useFields(array $fields = array(), $ordered = true)
     /**
      * Returns a form field for the main widget schema.
      *
-     * @return sfFormFieldSchema A sfFormFieldSchema instance
+     * @return \sfFormFieldSchema A sfFormFieldSchema instance
      */
     public function getFormFieldSchema()
     {
         if (null === $this->formFieldSchema) {
             $values = $this->isBound ? $this->taintedValues : $this->defaults + $this->widgetSchema->getDefaults();
 
-            $this->formFieldSchema = new sfFormFieldSchema($this->widgetSchema, null, null, $values, $this->errorSchema);
+            $this->formFieldSchema = new \sfFormFieldSchema($this->widgetSchema, null, null, $values, $this->errorSchema);
         }
 
         return $this->formFieldSchema;
@@ -1138,17 +1139,17 @@ public function getFormFieldSchema()
      */
     public function getErrors()
     {
-        $errors = array();
+        $errors = [];
 
         if ($this->hasGlobalErrors()) {
-            $errors['_globals'] = array();
+            $errors['_globals'] = [];
             foreach ($this->getGlobalErrors() as $name => $error) {
                 $errors['_globals'][$name] = $error->getMessage();
             }
         }
 
         foreach ($this as $name => $field) {
-            if (!($field instanceof sfFormFieldSchema) && $field->hasError()) {
+            if (!($field instanceof \sfFormFieldSchema) && $field->hasError()) {
                 $errors[$this->widgetSchema->getFormFormatter()->generateLabelName($name)] = $field->getError()->getMessage();
             }
         }
@@ -1239,7 +1240,7 @@ public function count()
      */
     public static function convertFileInformation(array $taintedFiles)
     {
-        $files = array();
+        $files = [];
         foreach ($taintedFiles as $key => $data) {
             $files[$key] = self::fixPhpFilesArray($data);
         }
@@ -1264,7 +1265,7 @@ public static function hasToStringException()
      *
      * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
      *
-     * @return Exception
+     * @return \Exception
      */
     public static function getToStringException()
     {
@@ -1276,9 +1277,9 @@ public static function getToStringException()
      *
      * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
      *
-     * @param Exception $e The exception thrown by __toString()
+     * @param \Exception $e The exception thrown by __toString()
      */
-    public static function setToStringException(Exception $e)
+    public static function setToStringException(\Exception $e)
     {
         if (null === self::$toStringException) {
             self::$toStringException = $e;
@@ -1297,7 +1298,7 @@ protected function doBind(array $values)
 
     protected static function fixPhpFilesArray($data)
     {
-        $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
+        $fileKeys = ['error', 'name', 'size', 'tmp_name', 'type'];
         $keys = array_keys($data);
         sort($keys);
 
@@ -1310,13 +1311,13 @@ protected static function fixPhpFilesArray($data)
             unset($files[$k]);
         }
         foreach (array_keys($data['name']) as $key) {
-            $files[$key] = self::fixPhpFilesArray(array(
+            $files[$key] = self::fixPhpFilesArray([
                 'error' => $data['error'][$key],
                 'name' => $data['name'][$key],
                 'type' => $data['type'][$key],
                 'tmp_name' => $data['tmp_name'][$key],
                 'size' => $data['size'][$key],
-            ));
+            ]);
         }
 
         return $files;
@@ -1357,7 +1358,7 @@ protected function checkTaintedValues($values)
             }
 
             if (isset($value['tmp_name'])) {
-                throw new InvalidArgumentException('Do not try to fake a file upload.');
+                throw new \InvalidArgumentException('Do not try to fake a file upload.');
             }
 
             $this->checkTaintedValues($value);
diff --git a/lib/form/sfFormField.class.php b/lib/form/sfFormField.class.php
index a0d226a76..d04f26e1b 100644
--- a/lib/form/sfFormField.class.php
+++ b/lib/form/sfFormField.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,10 +20,10 @@ class sfFormField
 {
     protected static $toStringException;
 
-    /** @var sfWidgetForm */
+    /** @var \sfWidgetForm */
     protected $widget;
 
-    /** @var sfFormField|null */
+    /** @var \sfFormField|null */
     protected $parent;
 
     /** @var string */
@@ -37,13 +38,13 @@ class sfFormField
     /**
      * Constructor.
      *
-     * @param sfWidgetForm     $widget A sfWidget instance
-     * @param sfFormField      $parent The sfFormField parent instance (null for the root widget)
-     * @param string           $name   The field name
-     * @param string           $value  The field value
-     * @param sfValidatorError $error  A sfValidatorError instance
+     * @param \sfWidgetForm     $widget A sfWidget instance
+     * @param \sfFormField      $parent The sfFormField parent instance (null for the root widget)
+     * @param string            $name   The field name
+     * @param string            $value  The field value
+     * @param \sfValidatorError $error  A sfValidatorError instance
      */
-    public function __construct(sfWidgetForm $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
+    public function __construct(\sfWidgetForm $widget, \sfFormField $parent = null, $name, $value, \sfValidatorError $error = null)
     {
         $this->widget = $widget;
         $this->parent = $parent;
@@ -61,7 +62,7 @@ public function __toString()
     {
         try {
             return $this->render();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             self::setToStringException($e);
 
             // we return a simple Exception message in case the form framework is used out of symfony.
@@ -86,7 +87,7 @@ public static function hasToStringException()
      *
      * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
      *
-     * @return Exception
+     * @return \Exception
      */
     public static function getToStringException()
     {
@@ -98,9 +99,9 @@ public static function getToStringException()
      *
      * This is a hack needed because PHP does not allow to throw exceptions in __toString() magic method.
      *
-     * @param Exception $e The exception thrown by __toString()
+     * @param \Exception $e The exception thrown by __toString()
      */
-    public static function setToStringException(Exception $e)
+    public static function setToStringException(\Exception $e)
     {
         if (null === self::$toStringException) {
             self::$toStringException = $e;
@@ -114,7 +115,7 @@ public static function setToStringException(Exception $e)
      *
      * @return string The rendered widget
      */
-    public function render($attributes = array())
+    public function render($attributes = [])
     {
         if ($this->parent) {
             return $this->parent->getWidget()->renderField($this->name, $this->value, $attributes, $this->error);
@@ -136,19 +137,19 @@ public function render($attributes = array())
      *
      * @return string The formatted row
      */
-    public function renderRow($attributes = array(), $label = null, $help = null)
+    public function renderRow($attributes = [], $label = null, $help = null)
     {
         if (null === $this->parent) {
-            throw new LogicException(sprintf('Unable to render the row for "%s".', $this->name));
+            throw new \LogicException(sprintf('Unable to render the row for "%s".', $this->name));
         }
 
-        $field = $this->parent->getWidget()->renderField($this->name, $this->value, !is_array($attributes) ? array() : $attributes, $this->error);
+        $field = $this->parent->getWidget()->renderField($this->name, $this->value, !is_array($attributes) ? [] : $attributes, $this->error);
 
-        $error = $this->error instanceof sfValidatorErrorSchema ? $this->error->getGlobalErrors() : $this->error;
+        $error = $this->error instanceof \sfValidatorErrorSchema ? $this->error->getGlobalErrors() : $this->error;
 
         $help = null === $help ? $this->parent->getWidget()->getHelp($this->name) : $help;
 
-        return strtr($this->parent->getWidget()->getFormFormatter()->formatRow($this->renderLabel($label), $field, $error, $help), array('%hidden_fields%' => ''));
+        return strtr($this->parent->getWidget()->getFormFormatter()->formatRow($this->renderLabel($label), $field, $error, $help), ['%hidden_fields%' => '']);
     }
 
     /**
@@ -161,10 +162,10 @@ public function renderRow($attributes = array(), $label = null, $help = null)
     public function renderError()
     {
         if (null === $this->parent) {
-            throw new LogicException(sprintf('Unable to render the error for "%s".', $this->name));
+            throw new \LogicException(sprintf('Unable to render the error for "%s".', $this->name));
         }
 
-        $error = $this->getWidget() instanceof sfWidgetFormSchema ? $this->getWidget()->getGlobalErrors($this->error) : $this->error;
+        $error = $this->getWidget() instanceof \sfWidgetFormSchema ? $this->getWidget()->getGlobalErrors($this->error) : $this->error;
 
         return $this->parent->getWidget()->getFormFormatter()->formatErrorsForRow($error);
     }
@@ -177,7 +178,7 @@ public function renderError()
     public function renderHelp()
     {
         if (null === $this->parent) {
-            throw new LogicException(sprintf('Unable to render the help for "%s".', $this->name));
+            throw new \LogicException(sprintf('Unable to render the help for "%s".', $this->name));
         }
 
         return $this->parent->getWidget()->getFormFormatter()->formatHelp($this->parent->getWidget()->getHelp($this->name));
@@ -191,10 +192,10 @@ public function renderHelp()
      *
      * @return string The label tag
      */
-    public function renderLabel($label = null, $attributes = array())
+    public function renderLabel($label = null, $attributes = [])
     {
         if (null === $this->parent) {
-            throw new LogicException(sprintf('Unable to render the label for "%s".', $this->name));
+            throw new \LogicException(sprintf('Unable to render the label for "%s".', $this->name));
         }
 
         if (null !== $label) {
@@ -219,7 +220,7 @@ public function renderLabel($label = null, $attributes = array())
     public function renderLabelName()
     {
         if (null === $this->parent) {
-            throw new LogicException(sprintf('Unable to render the label name for "%s".', $this->name));
+            throw new \LogicException(sprintf('Unable to render the label name for "%s".', $this->name));
         }
 
         return $this->parent->getWidget()->getFormFormatter()->generateLabelName($this->name);
@@ -288,7 +289,7 @@ public function getWidget()
     /**
      * Returns the parent form field.
      *
-     * @return sfFormField A sfFormField instance
+     * @return \sfFormField A sfFormField instance
      */
     public function getParent()
     {
@@ -298,7 +299,7 @@ public function getParent()
     /**
      * Returns the error for this field.
      *
-     * @return sfValidatorError A sfValidatorError instance
+     * @return \sfValidatorError A sfValidatorError instance
      */
     public function getError()
     {
@@ -312,7 +313,7 @@ public function getError()
      */
     public function hasError()
     {
-        if ($this->error instanceof sfValidatorErrorSchema) {
+        if ($this->error instanceof \sfValidatorErrorSchema) {
             return $this->error->count() > 0;
         }
 
diff --git a/lib/form/sfFormFieldSchema.class.php b/lib/form/sfFormFieldSchema.class.php
index df5545120..1e2723952 100644
--- a/lib/form/sfFormFieldSchema.class.php
+++ b/lib/form/sfFormFieldSchema.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,22 +16,22 @@
  *
  * @version    SVN: $Id$
  */
-class sfFormFieldSchema extends sfFormField implements ArrayAccess, Iterator, Countable
+class sfFormFieldSchema extends \sfFormField implements \ArrayAccess, \Iterator, \Countable
 {
     protected $count = 0;
-    protected $fieldNames = array();
-    protected $fields = array();
+    protected $fieldNames = [];
+    protected $fields = [];
 
     /**
      * Constructor.
      *
-     * @param sfWidgetFormSchema $widget A sfWidget instance
-     * @param sfFormField        $parent The sfFormField parent instance (null for the root widget)
-     * @param string             $name   The field name
-     * @param string             $value  The field value
-     * @param sfValidatorError   $error  A sfValidatorError instance
+     * @param \sfWidgetFormSchema $widget A sfWidget instance
+     * @param \sfFormField        $parent The sfFormField parent instance (null for the root widget)
+     * @param string              $name   The field name
+     * @param string              $value  The field value
+     * @param \sfValidatorError   $error  A sfValidatorError instance
      */
-    public function __construct(sfWidgetFormSchema $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
+    public function __construct(\sfWidgetFormSchema $widget, \sfFormField $parent = null, $name, $value, \sfValidatorError $error = null)
     {
         parent::__construct($widget, $parent, $name, $value, $error);
 
@@ -64,10 +65,10 @@ public function renderHiddenFields($recursive = true)
      */
     public function getHiddenFields($recursive = true)
     {
-        $fields = array();
+        $fields = [];
 
         foreach ($this as $name => $field) {
-            if ($field instanceof sfFormFieldSchema && $recursive) {
+            if ($field instanceof \sfFormFieldSchema && $recursive) {
                 $fields = array_merge($fields, $field->getHiddenFields($recursive));
             } elseif ($field->isHidden()) {
                 $fields[] = $field;
@@ -95,24 +96,24 @@ public function offsetExists($name)
      *
      * @param string $name The offset of the value to get
      *
-     * @return sfFormField A form field instance
+     * @return \sfFormField A form field instance
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($name)
     {
         if (!isset($this->fields[$name])) {
             if (null === $widget = $this->widget[$name]) {
-                throw new InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
+                throw new \InvalidArgumentException(sprintf('Widget "%s" does not exist.', $name));
             }
 
             $error = isset($this->error[$name]) ? $this->error[$name] : null;
 
-            if ($widget instanceof sfWidgetFormSchema) {
+            if ($widget instanceof \sfWidgetFormSchema) {
                 $class = 'sfFormFieldSchema';
 
-                if ($error && !$error instanceof sfValidatorErrorSchema) {
+                if ($error && !$error instanceof \sfValidatorErrorSchema) {
                     $current = $error;
-                    $error = new sfValidatorErrorSchema($error->getValidator());
+                    $error = new \sfValidatorErrorSchema($error->getValidator());
                     $error->addError($current);
                 }
             } else {
@@ -131,12 +132,12 @@ public function offsetGet($name)
      * @param string $offset (ignored)
      * @param string $value  (ignored)
      *
-     * @throws LogicException
+     * @throws \LogicException
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        throw new LogicException('Cannot update form fields (read-only).');
+        throw new \LogicException('Cannot update form fields (read-only).');
     }
 
     /**
@@ -144,12 +145,12 @@ public function offsetSet($offset, $value)
      *
      * @param string $offset (ignored)
      *
-     * @throws LogicException
+     * @throws \LogicException
      */
     #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        throw new LogicException('Cannot remove form fields (read-only).');
+        throw new \LogicException('Cannot remove form fields (read-only).');
     }
 
     /**
diff --git a/lib/generator/sfGenerator.class.php b/lib/generator/sfGenerator.class.php
index c2262acf8..c6afafd58 100644
--- a/lib/generator/sfGenerator.class.php
+++ b/lib/generator/sfGenerator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +20,7 @@ abstract class sfGenerator
 {
     protected $generatorClass = '';
 
-    /** @var sfGeneratorManager */
+    /** @var \sfGeneratorManager */
     protected $generatorManager;
     protected $generatedModuleName = '';
     protected $theme = 'default';
@@ -30,7 +31,7 @@ abstract class sfGenerator
      *
      * @see initialize()
      */
-    public function __construct(sfGeneratorManager $generatorManager)
+    public function __construct(\sfGeneratorManager $generatorManager)
     {
         $this->initialize($generatorManager);
     }
@@ -38,9 +39,9 @@ public function __construct(sfGeneratorManager $generatorManager)
     /**
      * Initializes the current sfGenerator instance.
      *
-     * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
+     * @param \sfGeneratorManager $generatorManager A sfGeneratorManager instance
      */
-    public function initialize(sfGeneratorManager $generatorManager)
+    public function initialize(\sfGeneratorManager $generatorManager)
     {
         $this->generatorManager = $generatorManager;
     }
@@ -52,7 +53,7 @@ public function initialize(sfGeneratorManager $generatorManager)
      *
      * @return string The cache for the configuration file
      */
-    abstract public function generate($params = array());
+    abstract public function generate($params = []);
 
     /**
      * Gets the generator class.
@@ -140,7 +141,7 @@ public function setTheme($theme)
      * @param string $generatedModuleName The name of module name to generate
      * @param array  $files               A list of template files to generate
      */
-    protected function generatePhpFiles($generatedModuleName, $files = array())
+    protected function generatePhpFiles($generatedModuleName, $files = [])
     {
         foreach ($files as $file) {
             $this->getGeneratorManager()->save($generatedModuleName.'/'.$file, $this->evalTemplate($file));
@@ -178,13 +179,13 @@ protected function evalTemplate($templateFile)
     protected function replacePhpMarks($text)
     {
         // replace [?php and ?]
-        return str_replace(array('[?php', '[?=', '?]'), array('<?php', '<?php echo', '?>'), $text);
+        return str_replace(['[?php', '[?=', '?]'], ['<?php', '<?php echo', '?>'], $text);
     }
 
     /**
      * Gets the sfGeneratorManager instance.
      *
-     * @return sfGeneratorManager The sfGeneratorManager instance
+     * @return \sfGeneratorManager The sfGeneratorManager instance
      */
     protected function getGeneratorManager()
     {
diff --git a/lib/generator/sfGeneratorManager.class.php b/lib/generator/sfGeneratorManager.class.php
index 88c3055c1..1ac660678 100644
--- a/lib/generator/sfGeneratorManager.class.php
+++ b/lib/generator/sfGeneratorManager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,10 +24,10 @@ class sfGeneratorManager
     /**
      * Class constructor.
      *
-     * @param sfProjectConfiguration $configuration A sfProjectConfiguration instance
-     * @param string                 $basePath      The base path for file generation
+     * @param \sfProjectConfiguration $configuration A sfProjectConfiguration instance
+     * @param string                  $basePath      The base path for file generation
      */
-    public function __construct(sfProjectConfiguration $configuration, $basePath = null)
+    public function __construct(\sfProjectConfiguration $configuration, $basePath = null)
     {
         $this->configuration = $configuration;
         $this->basePath = $basePath;
@@ -35,7 +36,7 @@ public function __construct(sfProjectConfiguration $configuration, $basePath = n
     /**
      * Returns the current configuration instance.
      *
-     * @return sfProjectConfiguration A sfProjectConfiguration instance
+     * @return \sfProjectConfiguration A sfProjectConfiguration instance
      */
     public function getConfiguration()
     {
@@ -51,7 +52,7 @@ public function getBasePath()
     {
         if (null === $this->basePath) {
             // for BC
-            $this->basePath = sfConfig::get('sf_module_cache_dir');
+            $this->basePath = \sfConfig::get('sf_module_cache_dir');
         }
 
         return $this->basePath;
@@ -75,7 +76,7 @@ public function setBasePath($basePath)
      *
      * @return int
      *
-     * @throws sfCacheException
+     * @throws \sfCacheException
      */
     public function save($path, $content)
     {
@@ -91,7 +92,7 @@ public function save($path, $content)
         }
 
         if (false === $ret = @file_put_contents($path, $content)) {
-            throw new sfCacheException(sprintf('Failed to write cache file "%s".', $path));
+            throw new \sfCacheException(sprintf('Failed to write cache file "%s".', $path));
         }
 
         return $ret;
@@ -107,7 +108,7 @@ public function save($path, $content)
      */
     public function generate($generatorClass, $param)
     {
-        /** @var sfGenerator $generator */
+        /** @var \sfGenerator $generator */
         $generator = new $generatorClass($this);
 
         return $generator->generate($param);
diff --git a/lib/generator/sfModelGenerator.class.php b/lib/generator/sfModelGenerator.class.php
index cbb13fd2b..b57b8c32d 100644
--- a/lib/generator/sfModelGenerator.class.php
+++ b/lib/generator/sfModelGenerator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,14 +16,14 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfModelGenerator extends sfGenerator
+abstract class sfModelGenerator extends \sfGenerator
 {
-    /** @var sfModelGeneratorConfiguration */
+    /** @var \sfModelGeneratorConfiguration */
     protected $configuration;
-    protected $primaryKey = array();
+    protected $primaryKey = [];
     protected $modelClass = '';
-    protected $params = array();
-    protected $config = array();
+    protected $params = [];
+    protected $config = [];
     protected $formObject;
 
     /**
@@ -32,9 +33,9 @@ abstract class sfModelGenerator extends sfGenerator
      *
      * @return string The data to put in configuration cache
      *
-     * @throws sfConfigurationException
+     * @throws \sfConfigurationException
      */
-    public function generate($params = array())
+    public function generate($params = [])
     {
         $this->validateParameters($params);
 
@@ -49,7 +50,7 @@ public function generate($params = array())
         $this->setTheme($theme);
         $themeDir = $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $theme, '');
         if (!is_dir($themeDir)) {
-            throw new sfConfigurationException(sprintf('The theme "%s" does not exist.', $theme));
+            throw new \sfConfigurationException(sprintf('The theme "%s" does not exist.', $theme));
         }
 
         // configure the model
@@ -58,7 +59,7 @@ public function generate($params = array())
         $this->configuration = $this->loadConfiguration();
 
         // generate files
-        $this->generatePhpFiles($this->generatedModuleName, sfFinder::type('file')->relative()->in($themeDir));
+        $this->generatePhpFiles($this->generatedModuleName, \sfFinder::type('file')->relative()->in($themeDir));
 
         // move helper file
         if (file_exists($file = $this->generatorManager->getBasePath().'/'.$this->getGeneratedModuleName().'/lib/helper.php')) {
@@ -107,7 +108,7 @@ public function getPrimaryKeys($firstOne = false)
      */
     public function getSingularName()
     {
-        return isset($this->params['singular']) ? $this->params['singular'] : sfInflector::underscore($this->getModelClass());
+        return isset($this->params['singular']) ? $this->params['singular'] : \sfInflector::underscore($this->getModelClass());
     }
 
     /**
@@ -139,9 +140,9 @@ public function getI18nCatalogue()
      */
     public function getRetrieveByPkParamsForAction($indent)
     {
-        $params = array();
+        $params = [];
         foreach ($this->getPrimaryKeys() as $pk) {
-            $params[] = sprintf("\$request->getParameter('%s')", sfInflector::underscore($pk));
+            $params[] = sprintf("\$request->getParameter('%s')", \sfInflector::underscore($pk));
         }
 
         return implode(",\n".str_repeat(' ', max(0, $indent - strlen($this->getSingularName().$this->modelClass))), $params);
@@ -157,9 +158,9 @@ public function getRetrieveByPkParamsForAction($indent)
      */
     public function getPrimaryKeyUrlParams($prefix = '', $full = false)
     {
-        $params = array();
+        $params = [];
         foreach ($this->getPrimaryKeys() as $pk) {
-            $fieldName = sfInflector::underscore($pk);
+            $fieldName = \sfInflector::underscore($pk);
 
             if ($full) {
                 $params[] = sprintf("%s='.%s->%s()", $fieldName, $prefix, $this->getColumnGetter($fieldName, false));
@@ -201,7 +202,7 @@ abstract public function getManyToManyTables();
      */
     public function getLinkToAction($actionName, $params, $pk_link = false)
     {
-        $action = isset($params['action']) ? $params['action'] : 'List'.sfInflector::camelize($actionName);
+        $action = isset($params['action']) ? $params['action'] : 'List'.\sfInflector::camelize($actionName);
 
         $url_params = $pk_link ? '?'.$this->getPrimaryKeyUrlParams() : '\'';
 
@@ -216,7 +217,7 @@ public function getLinkToAction($actionName, $params, $pk_link = false)
      *
      * @return string HTML code
      */
-    public function addCredentialCondition($content, $params = array())
+    public function addCredentialCondition($content, $params = [])
     {
         if (isset($params['credentials'])) {
             $credentials = $this->asPhp($params['credentials']);
@@ -235,7 +236,7 @@ public function addCredentialCondition($content, $params = array())
     /**
      * Returns HTML code for a field.
      *
-     * @param sfModelGeneratorConfigurationField $field The field
+     * @param \sfModelGeneratorConfigurationField $field The field
      *
      * @return string HTML code
      */
@@ -278,12 +279,12 @@ public function getI18NString($key)
 
         // find %%xx%% strings
         preg_match_all('/%%([^%]+)%%/', $value, $matches, PREG_PATTERN_ORDER);
-        $fields = array();
+        $fields = [];
         foreach ($matches[1] as $name) {
             $fields[] = $name;
         }
 
-        $vars = array();
+        $vars = [];
         foreach ($this->configuration->getContextConfiguration($context, $fields) as $field) {
             $vars[] = '\'%%'.$field->getName().'%%\' => '.$this->renderField($field);
         }
@@ -294,7 +295,7 @@ public function getI18NString($key)
     /**
      * Gets the form object.
      *
-     * @return sfForm
+     * @return \sfForm
      */
     public function getFormObject()
     {
@@ -339,7 +340,7 @@ public function getUrlForAction($action)
 
     public function asPhp($variable)
     {
-        return str_replace(array("\n", 'array ('), array('', 'array('), var_export($variable, true));
+        return str_replace(["\n", 'array ('], ['', 'array('], var_export($variable, true));
     }
 
     public function escapeString($string)
@@ -357,22 +358,22 @@ abstract protected function configure();
      *
      * @param array $params An array of parameters
      *
-     * @throws sfInitializationException
-     * @throws sfParseException
+     * @throws \sfInitializationException
+     * @throws \sfParseException
      */
     protected function validateParameters($params)
     {
-        foreach (array('model_class', 'moduleName') as $key) {
+        foreach (['model_class', 'moduleName'] as $key) {
             if (!isset($params[$key])) {
-                throw new sfParseException(sprintf('sfModelGenerator must have a "%s" parameter.', $key));
+                throw new \sfParseException(sprintf('sfModelGenerator must have a "%s" parameter.', $key));
             }
         }
 
         if (!class_exists($params['model_class'])) {
-            throw new sfInitializationException(sprintf('Unable to generate a module for non-existent model "%s".', $params['model_class']));
+            throw new \sfInitializationException(sprintf('Unable to generate a module for non-existent model "%s".', $params['model_class']));
         }
 
-        $this->config = isset($params['config']) ? $params['config'] : array();
+        $this->config = isset($params['config']) ? $params['config'] : [];
 
         unset($params['config']);
         $this->params = $params;
@@ -385,13 +386,13 @@ protected function loadConfiguration()
     {
         try {
             $this->generatorManager->getConfiguration()->getGeneratorTemplate($this->getGeneratorClass(), $this->getTheme(), '../parts/configuration.php');
-        } catch (sfException $e) {
+        } catch (\sfException $e) {
             return null;
         }
 
         $config = $this->getGeneratorManager()->getConfiguration();
-        if (!$config instanceof sfApplicationConfiguration) {
-            throw new LogicException('The sfModelGenerator can only operates with an application configuration.');
+        if (!$config instanceof \sfApplicationConfiguration) {
+            throw new \LogicException('The sfModelGenerator can only operates with an application configuration.');
         }
 
         $basePath = $this->getGeneratedModuleName().'/lib/Base'.ucfirst($this->getModuleName()).'GeneratorConfiguration.class.php';
@@ -417,7 +418,7 @@ protected function loadConfiguration()
                 continue;
             }
 
-            throw new InvalidArgumentException(sprintf('Your generator configuration contains some errors for the "%s" context. The following configuration cannot be parsed: %s.', $context, $this->asPhp($value)));
+            throw new \InvalidArgumentException(sprintf('Your generator configuration contains some errors for the "%s" context. The following configuration cannot be parsed: %s.', $context, $this->asPhp($value)));
         }
 
         return new $class();
diff --git a/lib/generator/sfModelGeneratorConfiguration.class.php b/lib/generator/sfModelGeneratorConfiguration.class.php
index af957893a..cea44c968 100644
--- a/lib/generator/sfModelGeneratorConfiguration.class.php
+++ b/lib/generator/sfModelGeneratorConfiguration.class.php
@@ -1,16 +1,18 @@
 <?php
 
-/**
- * Model generator configuration.
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    SVN: $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
+
 abstract class sfModelGeneratorConfiguration
 {
     /** @var sfModelGeneratorConfigurationField[][][] */
-    protected $configuration = array();
+    protected $configuration = [];
 
     /**
      * Constructor.
@@ -81,14 +83,14 @@ abstract public function getFilterFormClass();
     public function getContextConfiguration($context, $fields = null)
     {
         if (!isset($this->configuration[$context])) {
-            throw new InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
+            throw new \InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
         }
 
         if (null === $fields) {
             return $this->configuration[$context];
         }
 
-        $f = array();
+        $f = [];
         foreach ($fields as $field) {
             $f[$field] = $this->configuration[$context]['fields'][$field];
         }
@@ -99,11 +101,11 @@ public function getContextConfiguration($context, $fields = null)
     public function getFieldConfiguration($context, $field)
     {
         if (!isset($this->configuration[$context])) {
-            throw new InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
+            throw new \InvalidArgumentException(sprintf('The context "%s" does not exist.', $context));
         }
 
         if (!isset($this->configuration[$context]['fields'][$field])) {
-            throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $field));
+            throw new \InvalidArgumentException(sprintf('Field "%s" does not exist.', $field));
         }
 
         return $this->configuration[$context]['fields'][$field];
@@ -123,9 +125,9 @@ public function getValue($key, $default = null, $escaped = false)
         if (preg_match('/^(?P<context>[^\.]+)\.fields\.(?P<field>[^\.]+)\.(?P<key>.+)$/', $key, $matches)) {
             $v = $this->getFieldConfiguration($matches['context'], $matches['field'])->getConfig($matches['key'], $default);
         } elseif (preg_match('/^(?P<context>[^\.]+)\.(?P<key>.+)$/', $key, $matches)) {
-            $v = sfModelGeneratorConfiguration::getFieldConfigValue($this->getContextConfiguration($matches['context']), $matches['key'], $default);
+            $v = \sfModelGeneratorConfiguration::getFieldConfigValue($this->getContextConfiguration($matches['context']), $matches['key'], $default);
         } else {
-            throw new InvalidArgumentException(sprintf('Configuration key "%s" is invalid.', $key));
+            throw new \InvalidArgumentException(sprintf('Configuration key "%s" is invalid.', $key));
         }
 
         return $escaped ? str_replace("'", "\\'", $v) : $v;
@@ -137,23 +139,23 @@ public function getValue($key, $default = null, $escaped = false)
      * If no filter.display parameter is passed in the configuration,
      * all the fields from the form are returned (dynamically).
      *
-     * @param sfForm $form The form with the fields
+     * @param \sfForm $form The form with the fields
      *
      * @return array
      */
-    public function getFormFilterFields(sfForm $form)
+    public function getFormFilterFields(\sfForm $form)
     {
         $config = $this->getConfig();
 
         if ($this->getFilterDisplay()) {
-            $fields = array();
+            $fields = [];
             foreach ($this->getFilterDisplay() as $name) {
-                list($name, $flag) = sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
+                list($name, $flag) = \sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
                 if (!isset($this->configuration['filter']['fields'][$name])) {
-                    $this->configuration['filter']['fields'][$name] = new sfModelGeneratorConfigurationField($name, array_merge(
-                        isset($config['default'][$name]) ? $config['default'][$name] : array(),
-                        isset($config['filter'][$name]) ? $config['filter'][$name] : array(),
-                        array('is_real' => false, 'type' => 'Text', 'flag' => $flag)
+                    $this->configuration['filter']['fields'][$name] = new \sfModelGeneratorConfigurationField($name, array_merge(
+                        isset($config['default'][$name]) ? $config['default'][$name] : [],
+                        isset($config['filter'][$name]) ? $config['filter'][$name] : [],
+                        ['is_real' => false, 'type' => 'Text', 'flag' => $flag]
                     ));
                 }
                 $field = $this->configuration['filter']['fields'][$name];
@@ -164,13 +166,13 @@ public function getFormFilterFields(sfForm $form)
             return $fields;
         }
 
-        $fields = array();
+        $fields = [];
         foreach ($form->getWidgetSchema()->getPositions() as $name) {
-            $fields[$name] = new sfModelGeneratorConfigurationField($name, array_merge(
-                array('type' => 'Text'),
-                isset($config['default'][$name]) ? $config['default'][$name] : array(),
-                isset($config['filter'][$name]) ? $config['filter'][$name] : array(),
-                array('is_real' => false)
+            $fields[$name] = new \sfModelGeneratorConfigurationField($name, array_merge(
+                ['type' => 'Text'],
+                isset($config['default'][$name]) ? $config['default'][$name] : [],
+                isset($config['filter'][$name]) ? $config['filter'][$name] : [],
+                ['is_real' => false]
             ));
         }
 
@@ -183,12 +185,12 @@ public function getFormFilterFields(sfForm $form)
      * If no form.display parameter is passed in the configuration,
      * all the fields from the form are returned (dynamically).
      *
-     * @param sfForm $form    The form with the fields
-     * @param string $context The display context
+     * @param \sfForm $form    The form with the fields
+     * @param string  $context The display context
      *
      * @return array
      */
-    public function getFormFields(sfForm $form, $context)
+    public function getFormFields(\sfForm $form, $context)
     {
         $config = $this->getConfig();
 
@@ -198,11 +200,11 @@ public function getFormFields(sfForm $form, $context)
         }
 
         if ($fieldsets) {
-            $fields = array();
+            $fields = [];
 
             // with fieldsets?
             if (!is_array(reset($fieldsets))) {
-                $fieldsets = array('NONE' => $fieldsets);
+                $fieldsets = ['NONE' => $fieldsets];
             }
 
             foreach ($fieldsets as $fieldset => $names) {
@@ -210,16 +212,16 @@ public function getFormFields(sfForm $form, $context)
                     continue;
                 }
 
-                $fields[$fieldset] = array();
+                $fields[$fieldset] = [];
 
                 foreach ($names as $name) {
-                    list($name, $flag) = sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
+                    list($name, $flag) = \sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
                     if (!isset($this->configuration[$context]['fields'][$name])) {
-                        $this->configuration[$context]['fields'][$name] = new sfModelGeneratorConfigurationField($name, array_merge(
-                            isset($config['default'][$name]) ? $config['default'][$name] : array(),
-                            isset($config['form'][$name]) ? $config['form'][$name] : array(),
-                            isset($config[$context][$name]) ? $config[$context][$name] : array(),
-                            array('is_real' => false, 'type' => 'Text', 'flag' => $flag)
+                        $this->configuration[$context]['fields'][$name] = new \sfModelGeneratorConfigurationField($name, array_merge(
+                            isset($config['default'][$name]) ? $config['default'][$name] : [],
+                            isset($config['form'][$name]) ? $config['form'][$name] : [],
+                            isset($config[$context][$name]) ? $config[$context][$name] : [],
+                            ['is_real' => false, 'type' => 'Text', 'flag' => $flag]
                         ));
                     }
 
@@ -232,18 +234,18 @@ public function getFormFields(sfForm $form, $context)
             return $fields;
         }
 
-        $fields = array();
+        $fields = [];
         foreach ($form->getWidgetSchema()->getPositions() as $name) {
-            $fields[$name] = new sfModelGeneratorConfigurationField($name, array_merge(
-                array('type' => 'Text'),
-                isset($config['default'][$name]) ? $config['default'][$name] : array(),
-                isset($config['form'][$name]) ? $config['form'][$name] : array(),
-                isset($config[$context][$name]) ? $config[$context][$name] : array(),
-                array('is_real' => false)
+            $fields[$name] = new \sfModelGeneratorConfigurationField($name, array_merge(
+                ['type' => 'Text'],
+                isset($config['default'][$name]) ? $config['default'][$name] : [],
+                isset($config['form'][$name]) ? $config['form'][$name] : [],
+                isset($config[$context][$name]) ? $config[$context][$name] : [],
+                ['is_real' => false]
             ));
         }
 
-        return array('NONE' => $fields);
+        return ['NONE' => $fields];
     }
 
     /**
@@ -278,11 +280,11 @@ public static function getFieldConfigValue($config, $key, $default = null)
 
     public function getCredentials($action)
     {
-        if (0 === strpos($action, '_')) {
+        if (str_starts_with($action, '_')) {
             $action = substr($action, 1);
         }
 
-        return isset($this->configuration['credentials'][$action]) ? $this->configuration['credentials'][$action] : array();
+        return isset($this->configuration['credentials'][$action]) ? $this->configuration['credentials'][$action] : [];
     }
 
     public function getPager($model)
@@ -296,12 +298,12 @@ public function getPager($model)
     /**
      * Gets a new form object.
      *
-     * @param array      $options An array of options to merge with the options returned by getFormOptions()
-     * @param mixed|null $object
+     * @param array       $options An array of options to merge with the options returned by getFormOptions()
+     * @param \mixed|null $object
      *
-     * @return sfForm
+     * @return \sfForm
      */
-    public function getForm($object = null, $options = array())
+    public function getForm($object = null, $options = [])
     {
         $class = $this->getFormClass();
 
@@ -310,7 +312,7 @@ public function getForm($object = null, $options = array())
 
     public function getFormOptions()
     {
-        return array();
+        return [];
     }
 
     public function getFilterForm($filters)
@@ -322,12 +324,12 @@ public function getFilterForm($filters)
 
     public function getFilterFormOptions()
     {
-        return array();
+        return [];
     }
 
     public function getFilterDefaults()
     {
-        return array();
+        return [];
     }
 
     protected function compile()
@@ -338,56 +340,56 @@ protected function compile()
         // new|edit < form < default
         // list < default
         // filter < default
-        $this->configuration = array(
-            'list' => array(
-                'fields' => array(),
+        $this->configuration = [
+            'list' => [
+                'fields' => [],
                 'layout' => $this->getListLayout(),
                 'title' => $this->getListTitle(),
                 'actions' => $this->getListActions(),
                 'object_actions' => $this->getListObjectActions(),
                 'params' => $this->getListParams(),
-            ),
-            'filter' => array(
-                'fields' => array(),
-            ),
-            'form' => array(
-                'fields' => array(),
-            ),
-            'new' => array(
-                'fields' => array(),
+            ],
+            'filter' => [
+                'fields' => [],
+            ],
+            'form' => [
+                'fields' => [],
+            ],
+            'new' => [
+                'fields' => [],
                 'title' => $this->getNewTitle(),
                 'actions' => $this->getNewActions() ?: $this->getFormActions(),
-            ),
-            'edit' => array(
-                'fields' => array(),
+            ],
+            'edit' => [
+                'fields' => [],
                 'title' => $this->getEditTitle(),
                 'actions' => $this->getEditActions() ?: $this->getFormActions(),
-            ),
-        );
+            ],
+        ];
 
         foreach (array_keys($config['default']) as $field) {
-            $formConfig = array_merge($config['default'][$field], isset($config['form'][$field]) ? $config['form'][$field] : array());
+            $formConfig = array_merge($config['default'][$field], isset($config['form'][$field]) ? $config['form'][$field] : []);
 
-            $this->configuration['list']['fields'][$field] = new sfModelGeneratorConfigurationField($field, array_merge(array('label' => sfInflector::humanize(sfInflector::underscore($field))), $config['default'][$field], isset($config['list'][$field]) ? $config['list'][$field] : array()));
-            $this->configuration['filter']['fields'][$field] = new sfModelGeneratorConfigurationField($field, array_merge($config['default'][$field], isset($config['filter'][$field]) ? $config['filter'][$field] : array()));
-            $this->configuration['new']['fields'][$field] = new sfModelGeneratorConfigurationField($field, array_merge($formConfig, isset($config['new'][$field]) ? $config['new'][$field] : array()));
-            $this->configuration['edit']['fields'][$field] = new sfModelGeneratorConfigurationField($field, array_merge($formConfig, isset($config['edit'][$field]) ? $config['edit'][$field] : array()));
+            $this->configuration['list']['fields'][$field] = new \sfModelGeneratorConfigurationField($field, array_merge(['label' => \sfInflector::humanize(\sfInflector::underscore($field))], $config['default'][$field], isset($config['list'][$field]) ? $config['list'][$field] : []));
+            $this->configuration['filter']['fields'][$field] = new \sfModelGeneratorConfigurationField($field, array_merge($config['default'][$field], isset($config['filter'][$field]) ? $config['filter'][$field] : []));
+            $this->configuration['new']['fields'][$field] = new \sfModelGeneratorConfigurationField($field, array_merge($formConfig, isset($config['new'][$field]) ? $config['new'][$field] : []));
+            $this->configuration['edit']['fields'][$field] = new \sfModelGeneratorConfigurationField($field, array_merge($formConfig, isset($config['edit'][$field]) ? $config['edit'][$field] : []));
         }
 
         // "virtual" fields for list
         foreach ($this->getListDisplay() as $field) {
-            list($field, $flag) = sfModelGeneratorConfigurationField::splitFieldWithFlag($field);
+            list($field, $flag) = \sfModelGeneratorConfigurationField::splitFieldWithFlag($field);
 
-            $this->configuration['list']['fields'][$field] = new sfModelGeneratorConfigurationField($field, array_merge(
-                array('type' => 'Text', 'label' => sfInflector::humanize(sfInflector::underscore($field))),
-                isset($config['default'][$field]) ? $config['default'][$field] : array(),
-                isset($config['list'][$field]) ? $config['list'][$field] : array(),
-                array('flag' => $flag)
+            $this->configuration['list']['fields'][$field] = new \sfModelGeneratorConfigurationField($field, array_merge(
+                ['type' => 'Text', 'label' => \sfInflector::humanize(\sfInflector::underscore($field))],
+                isset($config['default'][$field]) ? $config['default'][$field] : [],
+                isset($config['list'][$field]) ? $config['list'][$field] : [],
+                ['flag' => $flag]
             ));
         }
 
         // form actions
-        foreach (array('edit', 'new') as $context) {
+        foreach (['edit', 'new'] as $context) {
             foreach ($this->configuration[$context]['actions'] as $action => $parameters) {
                 $this->configuration[$context]['actions'][$action] = $this->fixActionParameters($action, $parameters);
             }
@@ -399,11 +401,11 @@ protected function compile()
         }
 
         // list batch actions
-        $this->configuration['list']['batch_actions'] = array();
+        $this->configuration['list']['batch_actions'] = [];
         foreach ($this->getListBatchActions() as $action => $parameters) {
             $parameters = $this->fixActionParameters($action, $parameters);
 
-            $action = 'batch'.ucfirst(0 === strpos($action, '_') ? substr($action, 1) : $action);
+            $action = 'batch'.ucfirst(str_starts_with($action, '_') ? substr($action, 1) : $action);
 
             $this->configuration['list']['batch_actions'][$action] = $parameters;
         }
@@ -414,11 +416,11 @@ protected function compile()
         }
 
         // list field configuration
-        $this->configuration['list']['display'] = array();
+        $this->configuration['list']['display'] = [];
         foreach ($this->getListDisplay() as $name) {
-            list($name, $flag) = sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
+            list($name, $flag) = \sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
             if (!isset($this->configuration['list']['fields'][$name])) {
-                throw new InvalidArgumentException(sprintf('The field "%s" does not exist.', $name));
+                throw new \InvalidArgumentException(sprintf('The field "%s" does not exist.', $name));
             }
             $field = $this->configuration['list']['fields'][$name];
             $field->setFlag($flag);
@@ -433,21 +435,21 @@ protected function compile()
         $this->parseVariables('new', 'title');
 
         // action credentials
-        $this->configuration['credentials'] = array(
-            'list' => array(),
-            'new' => array(),
-            'create' => array(),
-            'edit' => array(),
-            'update' => array(),
-            'delete' => array(),
-        );
+        $this->configuration['credentials'] = [
+            'list' => [],
+            'new' => [],
+            'create' => [],
+            'edit' => [],
+            'update' => [],
+            'delete' => [],
+        ];
         foreach ($this->getActionsDefault() as $action => $params) {
-            if (0 === strpos($action, '_')) {
+            if (str_starts_with($action, '_')) {
                 $action = substr($action, 1);
             }
 
-            $this->configuration['credentials'][$action] = isset($params['credentials']) ? $params['credentials'] : array();
-            $this->configuration['credentials']['batch'.ucfirst($action)] = isset($params['credentials']) ? $params['credentials'] : array();
+            $this->configuration['credentials'][$action] = isset($params['credentials']) ? $params['credentials'] : [];
+            $this->configuration['credentials']['batch'.ucfirst($action)] = isset($params['credentials']) ? $params['credentials'] : [];
         }
         $this->configuration['credentials']['create'] = $this->configuration['credentials']['new'];
         $this->configuration['credentials']['update'] = $this->configuration['credentials']['edit'];
@@ -457,13 +459,13 @@ protected function parseVariables($context, $key)
     {
         preg_match_all('/%%([^%]+)%%/', $this->configuration[$context][$key], $matches, PREG_PATTERN_ORDER);
         foreach ($matches[1] as $name) {
-            list($name, $flag) = sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
+            list($name, $flag) = \sfModelGeneratorConfigurationField::splitFieldWithFlag($name);
             if (!isset($this->configuration[$context]['fields'][$name])) {
-                $this->configuration[$context]['fields'][$name] = new sfModelGeneratorConfigurationField($name, array_merge(
-                    array('type' => 'Text', 'label' => sfInflector::humanize(sfInflector::underscore($name))),
-                    isset($config['default'][$name]) ? $config['default'][$name] : array(),
-                    isset($config[$context][$name]) ? $config[$context][$name] : array(),
-                    array('flag' => $flag)
+                $this->configuration[$context]['fields'][$name] = new \sfModelGeneratorConfigurationField($name, array_merge(
+                    ['type' => 'Text', 'label' => \sfInflector::humanize(\sfInflector::underscore($name))],
+                    isset($config['default'][$name]) ? $config['default'][$name] : [],
+                    isset($config[$context][$name]) ? $config[$context][$name] : [],
+                    ['flag' => $flag]
                 ));
             } else {
                 $this->configuration[$context]['fields'][$name]->setFlag($flag);
@@ -473,7 +475,7 @@ protected function parseVariables($context, $key)
         }
     }
 
-    protected function mapFieldName(sfModelGeneratorConfigurationField $field)
+    protected function mapFieldName(\sfModelGeneratorConfigurationField $field)
     {
         return $field->getName();
     }
@@ -481,11 +483,11 @@ protected function mapFieldName(sfModelGeneratorConfigurationField $field)
     protected function fixActionParameters($action, $parameters)
     {
         if (null === $parameters) {
-            $parameters = array();
+            $parameters = [];
         }
 
         if (!isset($parameters['params'])) {
-            $parameters['params'] = array();
+            $parameters['params'] = [];
         }
 
         if ('_delete' == $action && !isset($parameters['confirm'])) {
@@ -508,20 +510,20 @@ protected function fixActionParameters($action, $parameters)
             $label = '_list' == $action ? 'Back to list' : substr($action, 1);
         }
 
-        $parameters['label'] = sfInflector::humanize($label);
+        $parameters['label'] = \sfInflector::humanize($label);
 
         return $parameters;
     }
 
     protected function getConfig()
     {
-        return array(
+        return [
             'default' => $this->getFieldsDefault(),
             'list' => $this->getFieldsList(),
             'filter' => $this->getFieldsFilter(),
             'form' => $this->getFieldsForm(),
             'new' => $this->getFieldsNew(),
             'edit' => $this->getFieldsEdit(),
-        );
+        ];
     }
 }
diff --git a/lib/generator/sfModelGeneratorConfigurationField.class.php b/lib/generator/sfModelGeneratorConfigurationField.class.php
index 2cd958d2c..6fcc8489c 100644
--- a/lib/generator/sfModelGeneratorConfigurationField.class.php
+++ b/lib/generator/sfModelGeneratorConfigurationField.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Model generator field.
  *
@@ -56,7 +65,7 @@ public function getConfig($key = null, $default = null, $escaped = false)
             return $this->config;
         }
 
-        $value = sfModelGeneratorConfiguration::getFieldConfigValue($this->config, $key, $default);
+        $value = \sfModelGeneratorConfiguration::getFieldConfigValue($this->config, $key, $default);
 
         return $escaped ? str_replace("'", "\\'", $value) : $value;
     }
@@ -178,18 +187,18 @@ public function setRendererArguments(array $arguments)
      */
     public function getRendererArguments()
     {
-        return isset($this->config['renderer_arguments']) ? $this->config['renderer_arguments'] : array();
+        return isset($this->config['renderer_arguments']) ? $this->config['renderer_arguments'] : [];
     }
 
     public static function splitFieldWithFlag($field)
     {
-        if (in_array($flag = $field[0], array('=', '_', '~'))) {
+        if (in_array($flag = $field[0], ['=', '_', '~'])) {
             $field = substr($field, 1);
         } else {
             $flag = null;
         }
 
-        return array($field, $flag);
+        return [$field, $flag];
     }
 
     /**
@@ -222,7 +231,7 @@ public function setFlag($flag)
                 break;
 
             default:
-                throw new InvalidArgumentException(sprintf('Flag "%s" does not exist.', $flag));
+                throw new \InvalidArgumentException(sprintf('Flag "%s" does not exist.', $flag));
         }
     }
 
diff --git a/lib/generator/sfModelGeneratorHelper.class.php b/lib/generator/sfModelGeneratorHelper.class.php
index 5c9e66a0d..9724dd0cf 100644
--- a/lib/generator/sfModelGeneratorHelper.class.php
+++ b/lib/generator/sfModelGeneratorHelper.class.php
@@ -1,24 +1,26 @@
 <?php
 
-/**
- * Model generator helper.
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    SVN: $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
+
 abstract class sfModelGeneratorHelper
 {
     abstract public function getUrlForAction($action);
 
     public function linkToNew($params)
     {
-        return '<li class="sf_admin_action_new">'.link_to(__($params['label'], array(), 'sf_admin'), '@'.$this->getUrlForAction('new')).'</li>';
+        return '<li class="sf_admin_action_new">'.link_to(__($params['label'], [], 'sf_admin'), '@'.$this->getUrlForAction('new')).'</li>';
     }
 
     public function linkToEdit($object, $params)
     {
-        return '<li class="sf_admin_action_edit">'.link_to(__($params['label'], array(), 'sf_admin'), $this->getUrlForAction('edit'), $object).'</li>';
+        return '<li class="sf_admin_action_edit">'.link_to(__($params['label'], [], 'sf_admin'), $this->getUrlForAction('edit'), $object).'</li>';
     }
 
     /**
@@ -33,17 +35,17 @@ public function linkToDelete($object, $params)
             return '';
         }
 
-        return '<li class="sf_admin_action_delete">'.link_to(__($params['label'], array(), 'sf_admin'), $this->getUrlForAction('delete'), $object, array('method' => 'delete', 'confirm' => !empty($params['confirm']) ? __($params['confirm'], array(), 'sf_admin') : $params['confirm'])).'</li>';
+        return '<li class="sf_admin_action_delete">'.link_to(__($params['label'], [], 'sf_admin'), $this->getUrlForAction('delete'), $object, ['method' => 'delete', 'confirm' => !empty($params['confirm']) ? __($params['confirm'], [], 'sf_admin') : $params['confirm']]).'</li>';
     }
 
     public function linkToList($params)
     {
-        return '<li class="sf_admin_action_list">'.link_to(__($params['label'], array(), 'sf_admin'), '@'.$this->getUrlForAction('list')).'</li>';
+        return '<li class="sf_admin_action_list">'.link_to(__($params['label'], [], 'sf_admin'), '@'.$this->getUrlForAction('list')).'</li>';
     }
 
     public function linkToSave($object, $params)
     {
-        return '<li class="sf_admin_action_save"><input type="submit" value="'.__($params['label'], array(), 'sf_admin').'" /></li>';
+        return '<li class="sf_admin_action_save"><input type="submit" value="'.__($params['label'], [], 'sf_admin').'" /></li>';
     }
 
     /**
@@ -58,6 +60,6 @@ public function linkToSaveAndAdd($object, $params)
             return '';
         }
 
-        return '<li class="sf_admin_action_save_and_add"><input type="submit" value="'.__($params['label'], array(), 'sf_admin').'" name="_save_and_add" /></li>';
+        return '<li class="sf_admin_action_save_and_add"><input type="submit" value="'.__($params['label'], [], 'sf_admin').'" name="_save_and_add" /></li>';
     }
 }
diff --git a/lib/helper/AssetHelper.php b/lib/helper/AssetHelper.php
index d4effc844..739f9fae0 100644
--- a/lib/helper/AssetHelper.php
+++ b/lib/helper/AssetHelper.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004 David Heinemeier Hansson
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -42,14 +42,14 @@
  *
  * @return string XHTML compliant <link> tag
  */
-function auto_discovery_link_tag($type = 'rss', $url = '', $tag_options = array())
+function auto_discovery_link_tag($type = 'rss', $url = '', $tag_options = [])
 {
-    return tag('link', array(
+    return tag('link', [
         'rel' => isset($tag_options['rel']) ? $tag_options['rel'] : 'alternate',
         'type' => isset($tag_options['type']) ? $tag_options['type'] : 'application/'.$type.'+xml',
         'title' => isset($tag_options['title']) ? $tag_options['title'] : ucfirst($type),
         'href' => url_for($url, true),
-    ));
+    ]);
 }
 
 /**
@@ -71,11 +71,11 @@ function auto_discovery_link_tag($type = 'rss', $url = '', $tag_options = array(
  *
  * @return string file path to the JavaScript file
  *
- * @see    javascript_include_tag
+ * @see    \javascript_include_tag
  */
 function javascript_path($source, $absolute = false)
 {
-    return _compute_public_path($source, sfConfig::get('sf_web_js_dir_name', 'js'), 'js', $absolute);
+    return _compute_public_path($source, \sfConfig::get('sf_web_js_dir_name', 'js'), 'js', $absolute);
 }
 
 /**
@@ -95,12 +95,12 @@ function javascript_path($source, $absolute = false)
  *
  * @return string XHTML compliant <script> tag(s)
  *
- * @see    javascript_path
+ * @see    \javascript_path
  */
 function javascript_include_tag()
 {
     $sources = func_get_args();
-    $sourceOptions = (func_num_args() > 1 && is_array($sources[func_num_args() - 1])) ? array_pop($sources) : array();
+    $sourceOptions = (func_num_args() > 1 && is_array($sources[func_num_args() - 1])) ? array_pop($sources) : [];
 
     $html = '';
     foreach ($sources as $source) {
@@ -122,7 +122,7 @@ function javascript_include_tag()
             unset($sourceOptions['raw_name']);
         }
 
-        $options = array_merge(array('type' => 'text/javascript', 'src' => $source), $sourceOptions);
+        $options = array_merge(['type' => 'text/javascript', 'src' => $source], $sourceOptions);
         $tag = content_tag('script', '', $options);
 
         if (null !== $condition) {
@@ -154,11 +154,11 @@ function javascript_include_tag()
  *
  * @return string file path to the stylesheet file
  *
- * @see    stylesheet_tag
+ * @see    \stylesheet_tag
  */
 function stylesheet_path($source, $absolute = false)
 {
-    return _compute_public_path($source, sfConfig::get('sf_web_css_dir_name', 'css'), 'css', $absolute);
+    return _compute_public_path($source, \sfConfig::get('sf_web_css_dir_name', 'css'), 'css', $absolute);
 }
 
 /**
@@ -188,12 +188,12 @@ function stylesheet_path($source, $absolute = false)
  *
  * @return string XHTML compliant <link> tag(s)
  *
- * @see    stylesheet_path
+ * @see    \stylesheet_path
  */
 function stylesheet_tag()
 {
     $sources = func_get_args();
-    $sourceOptions = (func_num_args() > 1 && is_array($sources[func_num_args() - 1])) ? array_pop($sources) : array();
+    $sourceOptions = (func_num_args() > 1 && is_array($sources[func_num_args() - 1])) ? array_pop($sources) : [];
 
     $html = '';
     foreach ($sources as $source) {
@@ -215,7 +215,7 @@ function stylesheet_tag()
             unset($sourceOptions['raw_name']);
         }
 
-        $options = array_merge(array('rel' => 'stylesheet', 'type' => 'text/css', 'media' => 'screen', 'href' => $source), $sourceOptions);
+        $options = array_merge(['rel' => 'stylesheet', 'type' => 'text/css', 'media' => 'screen', 'href' => $source], $sourceOptions);
         $tag = tag('link', $options);
 
         if (null !== $condition) {
@@ -233,9 +233,9 @@ function stylesheet_tag()
  *
  * @see sfResponse->addStylesheet()
  */
-function use_stylesheet($css, $position = '', $options = array())
+function use_stylesheet($css, $position = '', $options = [])
 {
-    sfContext::getInstance()->getResponse()->addStylesheet($css, $position, $options);
+    \sfContext::getInstance()->getResponse()->addStylesheet($css, $position, $options);
 }
 
 /**
@@ -243,9 +243,9 @@ function use_stylesheet($css, $position = '', $options = array())
  *
  * @see sfResponse->addJavascript()
  */
-function use_javascript($js, $position = '', $options = array())
+function use_javascript($js, $position = '', $options = [])
 {
-    sfContext::getInstance()->getResponse()->addJavascript($js, $position, $options);
+    \sfContext::getInstance()->getResponse()->addJavascript($js, $position, $options);
 }
 
 /**
@@ -256,9 +256,9 @@ function use_javascript($js, $position = '', $options = array())
 function decorate_with($layout)
 {
     if (false === $layout) {
-        sfContext::getInstance()->get('view_instance')->setDecorator(false);
+        \sfContext::getInstance()->get('view_instance')->setDecorator(false);
     } else {
-        sfContext::getInstance()->get('view_instance')->setDecoratorTemplate($layout);
+        \sfContext::getInstance()->get('view_instance')->setDecoratorTemplate($layout);
     }
 }
 
@@ -281,11 +281,11 @@ function decorate_with($layout)
  *
  * @return string file path to the image file
  *
- * @see    image_tag
+ * @see    \image_tag
  */
 function image_path($source, $absolute = false)
 {
-    return _compute_public_path($source, sfConfig::get('sf_web_images_dir_name', 'images'), 'png', $absolute);
+    return _compute_public_path($source, \sfConfig::get('sf_web_images_dir_name', 'images'), 'png', $absolute);
 }
 
 /**
@@ -309,9 +309,9 @@ function image_path($source, $absolute = false)
  *
  * @return string XHTML compliant <img> tag
  *
- * @see    image_path
+ * @see    \image_path
  */
-function image_tag($source, $options = array())
+function image_tag($source, $options = [])
 {
     if (!$source) {
         return '';
@@ -355,13 +355,13 @@ function image_tag($source, $options = array())
 
 function _compute_public_path($source, $dir, $ext, $absolute = false)
 {
-    if (strpos($source, '://') || 0 === strpos($source, '//')) {
+    if (strpos($source, '://') ||   str_starts_with($source, '//')) {
         return $source;
     }
 
-    $request = sfContext::getInstance()->getRequest();
+    $request = \sfContext::getInstance()->getRequest();
     $sf_relative_url_root = $request->getRelativeUrlRoot();
-    if (0 !== strpos($source, '/')) {
+    if (!str_starts_with($source, '/')) {
         $source = $sf_relative_url_root.'/'.$dir.'/'.$source;
     }
 
@@ -371,11 +371,11 @@ function _compute_public_path($source, $dir, $ext, $absolute = false)
         $source = substr($source, 0, $pos);
     }
 
-    if (false === strpos(basename($source), '.')) {
+    if (!str_contains(basename($source), '.')) {
         $source .= '.'.$ext;
     }
 
-    if ($sf_relative_url_root && 0 !== strpos($source, $sf_relative_url_root)) {
+    if ($sf_relative_url_root &&   !str_starts_with($source, $sf_relative_url_root)) {
         $source = $sf_relative_url_root.$source;
     }
 
@@ -404,15 +404,15 @@ function _compute_public_path($source, $dir, $ext, $absolute = false)
  *
  * @return string XHTML compliant <meta> tag(s)
  *
- * @see    include_http_metas
+ * @see    \include_http_metas
  * @see    sfWebResponse::addMeta()
  */
 function include_metas()
 {
-    $context = sfContext::getInstance();
-    $i18n = sfConfig::get('sf_i18n') ? $context->getI18N() : null;
+    $context = \sfContext::getInstance();
+    $i18n = \sfConfig::get('sf_i18n') ? $context->getI18N() : null;
     foreach ($context->getResponse()->getMetas() as $name => $content) {
-        echo tag('meta', array('name' => $name, 'content' => null === $i18n ? $content : $i18n->__($content)))."\n";
+        echo tag('meta', ['name' => $name, 'content' => null === $i18n ? $content : $i18n->__($content)])."\n";
     }
 }
 
@@ -430,13 +430,13 @@ function include_metas()
  *
  * @return string XHTML compliant <meta> tag(s)
  *
- * @see    include_metas
+ * @see    \include_metas
  * @see    sfWebResponse::addHttpMeta()
  */
 function include_http_metas()
 {
-    foreach (sfContext::getInstance()->getResponse()->getHttpMetas() as $httpequiv => $value) {
-        echo tag('meta', array('http-equiv' => $httpequiv, 'content' => $value))."\n";
+    foreach (\sfContext::getInstance()->getResponse()->getHttpMetas() as $httpequiv => $value) {
+        echo tag('meta', ['http-equiv' => $httpequiv, 'content' => $value])."\n";
     }
 }
 
@@ -450,7 +450,7 @@ function include_http_metas()
  */
 function include_title()
 {
-    $title = sfContext::getInstance()->getResponse()->getTitle();
+    $title = \sfContext::getInstance()->getResponse()->getTitle();
 
     echo content_tag('title', $title)."\n";
 }
@@ -466,8 +466,8 @@ function include_title()
  */
 function get_javascripts()
 {
-    $response = sfContext::getInstance()->getResponse();
-    sfConfig::set('symfony.asset.javascripts_included', true);
+    $response = \sfContext::getInstance()->getResponse();
+    \sfConfig::set('symfony.asset.javascripts_included', true);
 
     $html = '';
     foreach ($response->getJavascripts() as $file => $options) {
@@ -494,7 +494,7 @@ function include_javascripts()
  */
 function clear_javascripts()
 {
-    sfContext::getInstance()->getResponse()->clearJavascripts();
+    \sfContext::getInstance()->getResponse()->clearJavascripts();
 }
 
 /**
@@ -508,8 +508,8 @@ function clear_javascripts()
  */
 function get_stylesheets()
 {
-    $response = sfContext::getInstance()->getResponse();
-    sfConfig::set('symfony.asset.stylesheets_included', true);
+    $response = \sfContext::getInstance()->getResponse();
+    \sfConfig::set('symfony.asset.stylesheets_included', true);
 
     $html = '';
     foreach ($response->getStylesheets() as $file => $options) {
@@ -535,7 +535,7 @@ function include_stylesheets()
  */
 function clear_stylesheets()
 {
-    sfContext::getInstance()->getResponse()->clearStylesheets();
+    \sfContext::getInstance()->getResponse()->clearStylesheets();
 }
 
 /**
@@ -549,9 +549,9 @@ function clear_stylesheets()
  *
  * @return string XHTML compliant <script> tag(s)
  *
- * @see    javascript_include_tag
+ * @see    \javascript_include_tag
  */
-function dynamic_javascript_include_tag($uri, $absolute = false, $options = array())
+function dynamic_javascript_include_tag($uri, $absolute = false, $options = [])
 {
     $options['raw_name'] = true;
 
@@ -566,7 +566,7 @@ function dynamic_javascript_include_tag($uri, $absolute = false, $options = arra
  *
  * @see sfResponse->addJavascript()
  */
-function use_dynamic_javascript($js, $position = '', $options = array())
+function use_dynamic_javascript($js, $position = '', $options = [])
 {
     $options['raw_name'] = true;
 
@@ -581,7 +581,7 @@ function use_dynamic_javascript($js, $position = '', $options = array())
  *
  * @see sfResponse->addStylesheet()
  */
-function use_dynamic_stylesheet($css, $position = '', $options = array())
+function use_dynamic_stylesheet($css, $position = '', $options = [])
 {
     $options['raw_name'] = true;
 
@@ -590,7 +590,7 @@ function use_dynamic_stylesheet($css, $position = '', $options = array())
 
 function _dynamic_path($uri, $format, $absolute = false)
 {
-    return url_for($uri.(false === strpos($uri, '?') ? '?' : '&').'sf_format='.$format, $absolute);
+    return url_for($uri.(!str_contains($uri, '?') ? '?' : '&').'sf_format='.$format, $absolute);
 }
 
 /**
@@ -611,7 +611,7 @@ function _dynamic_path($uri, $format, $absolute = false)
  *
  * @return string <script> tags
  */
-function get_javascripts_for_form(sfForm $form)
+function get_javascripts_for_form(\sfForm $form)
 {
     $html = '';
     foreach ($form->getJavaScripts() as $file) {
@@ -626,7 +626,7 @@ function get_javascripts_for_form(sfForm $form)
  *
  * @see get_javascripts_for_form()
  */
-function include_javascripts_for_form(sfForm $form)
+function include_javascripts_for_form(\sfForm $form)
 {
     echo get_javascripts_for_form($form);
 }
@@ -634,9 +634,9 @@ function include_javascripts_for_form(sfForm $form)
 /**
  * Adds javascripts from the supplied form to the response object.
  */
-function use_javascripts_for_form(sfForm $form)
+function use_javascripts_for_form(\sfForm $form)
 {
-    $response = sfContext::getInstance()->getResponse();
+    $response = \sfContext::getInstance()->getResponse();
 
     foreach ($form->getJavaScripts() as $file) {
         $response->addJavascript($file);
@@ -661,11 +661,11 @@ function use_javascripts_for_form(sfForm $form)
  *
  * @return string <link> tags
  */
-function get_stylesheets_for_form(sfForm $form)
+function get_stylesheets_for_form(\sfForm $form)
 {
     $html = '';
     foreach ($form->getStylesheets() as $file => $media) {
-        $html .= stylesheet_tag($file, array('media' => $media));
+        $html .= stylesheet_tag($file, ['media' => $media]);
     }
 
     return $html;
@@ -676,7 +676,7 @@ function get_stylesheets_for_form(sfForm $form)
  *
  * @see get_stylesheets_for_form()
  */
-function include_stylesheets_for_form(sfForm $form)
+function include_stylesheets_for_form(\sfForm $form)
 {
     echo get_stylesheets_for_form($form);
 }
@@ -684,11 +684,11 @@ function include_stylesheets_for_form(sfForm $form)
 /**
  * Adds stylesheets from the supplied form to the response object.
  */
-function use_stylesheets_for_form(sfForm $form)
+function use_stylesheets_for_form(\sfForm $form)
 {
-    $response = sfContext::getInstance()->getResponse();
+    $response = \sfContext::getInstance()->getResponse();
 
     foreach ($form->getStylesheets() as $file => $media) {
-        $response->addStylesheet($file, '', array('media' => $media));
+        $response->addStylesheet($file, '', ['media' => $media]);
     }
 }
diff --git a/lib/helper/CacheHelper.php b/lib/helper/CacheHelper.php
index 0f75e3bf1..a038ead28 100644
--- a/lib/helper/CacheHelper.php
+++ b/lib/helper/CacheHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -28,21 +29,21 @@
 */
 function cache($name, $lifeTime = 86400)
 {
-    if (!sfConfig::get('sf_cache')) {
+    if (!\sfConfig::get('sf_cache')) {
         return null;
     }
 
-    $cache = sfContext::getInstance()->getViewCacheManager();
+    $cache = \sfContext::getInstance()->getViewCacheManager();
 
-    if (sfConfig::get('symfony.cache.started')) {
-        throw new sfCacheException('Cache already started.');
+    if (\sfConfig::get('symfony.cache.started')) {
+        throw new \sfCacheException('Cache already started.');
     }
 
     $data = $cache->start($name, $lifeTime);
 
     if (null === $data) {
-        sfConfig::set('symfony.cache.started', true);
-        sfConfig::set('symfony.cache.current_name', $name);
+        \sfConfig::set('symfony.cache.started', true);
+        \sfConfig::set('symfony.cache.current_name', $name);
 
         return false;
     }
@@ -54,18 +55,18 @@ function cache($name, $lifeTime = 86400)
 
 function cache_save()
 {
-    if (!sfConfig::get('sf_cache')) {
+    if (!\sfConfig::get('sf_cache')) {
         return null;
     }
 
-    if (!sfConfig::get('symfony.cache.started')) {
-        throw new sfCacheException('Cache not started.');
+    if (!\sfConfig::get('symfony.cache.started')) {
+        throw new \sfCacheException('Cache not started.');
     }
 
-    $data = sfContext::getInstance()->getViewCacheManager()->stop(sfConfig::get('symfony.cache.current_name', ''));
+    $data = \sfContext::getInstance()->getViewCacheManager()->stop(\sfConfig::get('symfony.cache.current_name', ''));
 
-    sfConfig::set('symfony.cache.started', false);
-    sfConfig::set('symfony.cache.current_name', null);
+    \sfConfig::set('symfony.cache.started', false);
+    \sfConfig::set('symfony.cache.current_name', null);
 
     echo $data;
 }
diff --git a/lib/helper/DateHelper.php b/lib/helper/DateHelper.php
index c8e6e0973..685377173 100644
--- a/lib/helper/DateHelper.php
+++ b/lib/helper/DateHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,8 @@
  *
  * @version    SVN: $Id$
  *
- * @param mixed|null $culture
- * @param mixed|null $charset
+ * @param \mixed|null $culture
+ * @param \mixed|null $charset
  */
 function format_daterange($start_date, $end_date, $format = 'd', $full_text = '', $start_text = '', $end_text = '', $culture = null, $charset = null)
 {
@@ -33,22 +34,22 @@ function format_daterange($start_date, $end_date, $format = 'd', $full_text = ''
 
 function format_date($date, $format = 'd', $culture = null, $charset = null)
 {
-    static $dateFormats = array();
+    static $dateFormats = [];
 
     if (null === $date) {
         return null;
     }
 
     if (!$culture) {
-        $culture = sfContext::getInstance()->getUser()->getCulture();
+        $culture = \sfContext::getInstance()->getUser()->getCulture();
     }
 
     if (!$charset) {
-        $charset = sfConfig::get('sf_charset');
+        $charset = \sfConfig::get('sf_charset');
     }
 
     if (!isset($dateFormats[$culture])) {
-        $dateFormats[$culture] = new sfDateFormat($culture);
+        $dateFormats[$culture] = new \sfDateFormat($culture);
     }
 
     return $dateFormats[$culture]->format($date, $format, null, $charset);
@@ -67,7 +68,7 @@ function distance_of_time_in_words($from_time, $to_time = null, $include_seconds
     $distance_in_seconds = floor(abs($to_time - $from_time));
 
     $string = '';
-    $parameters = array();
+    $parameters = [];
 
     if ($distance_in_minutes <= 1) {
         if (!$include_seconds) {
@@ -112,7 +113,7 @@ function distance_of_time_in_words($from_time, $to_time = null, $include_seconds
         $parameters['%years%'] = floor($distance_in_minutes / 525960);
     }
 
-    if (sfConfig::get('sf_i18n')) {
+    if (\sfConfig::get('sf_i18n')) {
         require_once __DIR__.'/I18NHelper.php';
 
         return __($string, $parameters);
diff --git a/lib/helper/DebugHelper.php b/lib/helper/DebugHelper.php
index 68c81fa56..fa6d23285 100644
--- a/lib/helper/DebugHelper.php
+++ b/lib/helper/DebugHelper.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 function log_message($message, $priority = 'info')
 {
-    if (sfConfig::get('sf_logging_enabled')) {
-        sfContext::getInstance()->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array($message, 'priority' => constant('sfLogger::'.strtoupper($priority)))));
+    if (\sfConfig::get('sf_logging_enabled')) {
+        \sfContext::getInstance()->getEventDispatcher()->notify(new \sfEvent(null, 'application.log', [$message, 'priority' => constant('sfLogger::'.strtoupper($priority))]));
     }
 }
diff --git a/lib/helper/EscapingHelper.php b/lib/helper/EscapingHelper.php
index b72f27ad0..54c222c85 100644
--- a/lib/helper/EscapingHelper.php
+++ b/lib/helper/EscapingHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -41,7 +42,7 @@ function esc_entities($value)
 {
     // Numbers and boolean values get turned into strings which can cause problems
     // with type comparisons (e.g. === or is_int() etc).
-    return is_string($value) ? htmlentities($value, ENT_QUOTES, sfConfig::get('sf_charset')) : $value;
+    return is_string($value) ? htmlentities($value, ENT_QUOTES, \sfConfig::get('sf_charset')) : $value;
 }
 
 define('ESC_ENTITIES', 'esc_entities');
@@ -57,7 +58,7 @@ function esc_specialchars($value)
 {
     // Numbers and boolean values get turned into strings which can cause problems
     // with type comparisons (e.g. === or is_int() etc).
-    return is_string($value) ? htmlspecialchars($value, ENT_QUOTES, sfConfig::get('sf_charset')) : $value;
+    return is_string($value) ? htmlspecialchars($value, ENT_QUOTES, \sfConfig::get('sf_charset')) : $value;
 }
 
 define('ESC_SPECIALCHARS', 'esc_specialchars');
@@ -108,8 +109,8 @@ function esc_js($value)
 function esc_js_no_entities($value)
 {
     return str_replace(
-        array('\\', "\n", "\r", '"', "'"),
-        array('\\\\', '\\n', '\\r', '\\"', "\\'"),
+        ['\\', "\n", "\r", '"', "'"],
+        ['\\\\', '\\n', '\\r', '\\"', "\\'"],
         $value
     );
 }
diff --git a/lib/helper/HelperHelper.php b/lib/helper/HelperHelper.php
index 2d4499281..c4f1eef7e 100644
--- a/lib/helper/HelperHelper.php
+++ b/lib/helper/HelperHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  */
 function use_helper()
 {
-    $context = sfContext::getInstance();
+    $context = \sfContext::getInstance();
 
     $context->getConfiguration()->loadHelpers(func_get_args(), $context->getModuleName());
 }
diff --git a/lib/helper/I18NHelper.php b/lib/helper/I18NHelper.php
index 5f981b5d9..f53ecc7bc 100644
--- a/lib/helper/I18NHelper.php
+++ b/lib/helper/I18NHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,14 +16,14 @@
  *
  * @version    SVN: $Id$
  */
-function __($text, $args = array(), $catalogue = 'messages')
+function __($text, $args = [], $catalogue = 'messages')
 {
-    if (sfConfig::get('sf_i18n')) {
-        return sfContext::getInstance()->getI18N()->__($text, $args, $catalogue);
+    if (\sfConfig::get('sf_i18n')) {
+        return \sfContext::getInstance()->getI18N()->__($text, $args, $catalogue);
     }
 
     if (empty($args)) {
-        $args = array();
+        $args = [];
     }
 
     // replace object with strings
@@ -52,16 +53,16 @@ function __($text, $args = array(), $catalogue = 'messages')
  *
  * @return string Result of the translation
  */
-function format_number_choice($text, $args = array(), $number = null, $catalogue = 'messages')
+function format_number_choice($text, $args = [], $number = null, $catalogue = 'messages')
 {
     $translated = __($text, $args, $catalogue);
 
-    $choice = new sfChoiceFormat();
+    $choice = new \sfChoiceFormat();
 
     $retval = $choice->format($translated, $number);
 
     if (false === $retval) {
-        throw new sfException(sprintf('Unable to parse your choice "%s".', $translated));
+        throw new \sfException(sprintf('Unable to parse your choice "%s".', $translated));
     }
 
     return $retval;
@@ -69,7 +70,7 @@ function format_number_choice($text, $args = array(), $number = null, $catalogue
 
 function format_country($country_iso, $culture = null)
 {
-    $c = sfCultureInfo::getInstance(null === $culture ? sfContext::getInstance()->getUser()->getCulture() : $culture);
+    $c = \sfCultureInfo::getInstance(null === $culture ? \sfContext::getInstance()->getUser()->getCulture() : $culture);
     $countries = $c->getCountries();
 
     return isset($countries[$country_iso]) ? $countries[$country_iso] : '';
@@ -77,7 +78,7 @@ function format_country($country_iso, $culture = null)
 
 function format_language($language_iso, $culture = null)
 {
-    $c = sfCultureInfo::getInstance(null === $culture ? sfContext::getInstance()->getUser()->getCulture() : $culture);
+    $c = \sfCultureInfo::getInstance(null === $culture ? \sfContext::getInstance()->getUser()->getCulture() : $culture);
     $languages = $c->getLanguages();
 
     return isset($languages[$language_iso]) ? $languages[$language_iso] : '';
diff --git a/lib/helper/JavascriptBaseHelper.php b/lib/helper/JavascriptBaseHelper.php
index 233b3a564..3b684acaa 100644
--- a/lib/helper/JavascriptBaseHelper.php
+++ b/lib/helper/JavascriptBaseHelper.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004 David Heinemeier Hansson
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -30,7 +30,7 @@
  *   <?php echo link_to_function('Greeting', "alert('Hello world!')") ?>
  *   <?php echo link_to_function(image_tag('delete'), "do_delete()", array('confirm' => 'Really?')) ?>
  */
-function link_to_function($name, $function, $html_options = array())
+function link_to_function($name, $function, $html_options = [])
 {
     $html_options = _parse_attributes($html_options);
 
@@ -52,7 +52,7 @@ function link_to_function($name, $function, $html_options = array())
  * Examples:
  *   <?php echo button_to_function('Greeting', "alert('Hello world!')") ?>
  */
-function button_to_function($name, $function, $html_options = array())
+function button_to_function($name, $function, $html_options = [])
 {
     $html_options = _parse_attributes($html_options);
 
@@ -71,12 +71,12 @@ function button_to_function($name, $function, $html_options = array())
  *   => <script type="text/javascript">alert('All is good')</script>
  *   <?php javascript_tag() ?>alert('All is good')<?php end_javascript_tag() ?>.
  *
- * @param mixed|null $content
+ * @param \mixed|null $content
  */
 function javascript_tag($content = null)
 {
     if (null !== $content) {
-        return content_tag('script', javascript_cdata_section($content), array('type' => 'text/javascript'));
+        return content_tag('script', javascript_cdata_section($content), ['type' => 'text/javascript']);
     }
 
     ob_start();
@@ -98,7 +98,7 @@ function javascript_cdata_section($content)
  */
 function if_javascript()
 {
-    if (!sfContext::getInstance()->getRequest()->isXmlHttpRequest()) {
+    if (!\sfContext::getInstance()->getRequest()->isXmlHttpRequest()) {
         ob_start();
     }
 }
@@ -109,7 +109,7 @@ function if_javascript()
  */
 function end_if_javascript()
 {
-    if (!sfContext::getInstance()->getRequest()->isXmlHttpRequest()) {
+    if (!\sfContext::getInstance()->getRequest()->isXmlHttpRequest()) {
         $content = ob_get_clean();
         echo javascript_tag("document.write('".esc_js_no_entities($content)."');");
     }
@@ -119,7 +119,7 @@ function end_if_javascript()
  * converts the given PHP array or string to the corresponding javascript array or string.
  * javascript strings need to be single quoted.
  *
- * @param option (typically from option array)
+ * @param \option (typically from option array)
  *
  * @return string javascript string or array equivalent
  */
@@ -144,7 +144,7 @@ function array_or_string_for_javascript($option)
  */
 function options_for_javascript($options)
 {
-    $opts = array();
+    $opts = [];
     foreach ($options as $key => $value) {
         if (is_array($value)) {
             $value = options_for_javascript($value);
diff --git a/lib/helper/NumberHelper.php b/lib/helper/NumberHelper.php
index 6ae599b28..19ec7e75f 100644
--- a/lib/helper/NumberHelper.php
+++ b/lib/helper/NumberHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  *
- * @param mixed|null $culture
+ * @param \mixed|null $culture
  */
 function format_number($number, $culture = null)
 {
@@ -23,7 +24,7 @@ function format_number($number, $culture = null)
         return null;
     }
 
-    $numberFormat = new sfNumberFormat(_current_language($culture));
+    $numberFormat = new \sfNumberFormat(_current_language($culture));
 
     return $numberFormat->format($number);
 }
@@ -34,12 +35,12 @@ function format_currency($amount, $currency = null, $culture = null)
         return null;
     }
 
-    $numberFormat = new sfNumberFormat(_current_language($culture));
+    $numberFormat = new \sfNumberFormat(_current_language($culture));
 
     return $numberFormat->format($amount, 'c', $currency);
 }
 
 function _current_language($culture)
 {
-    return $culture ?: sfContext::getInstance()->getUser()->getCulture();
+    return $culture ?: \sfContext::getInstance()->getUser()->getCulture();
 }
diff --git a/lib/helper/PartialHelper.php b/lib/helper/PartialHelper.php
index feeb897dd..98bf61624 100644
--- a/lib/helper/PartialHelper.php
+++ b/lib/helper/PartialHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -32,7 +33,7 @@
  *
  * @see    get_component_slot, include_partial, include_component
  */
-function include_component_slot($name, $vars = array())
+function include_component_slot($name, $vars = [])
 {
     echo get_component_slot($name, $vars);
 }
@@ -53,13 +54,13 @@ function include_component_slot($name, $vars = array())
  *
  * @see    get_component_slot, include_partial, include_component
  */
-function get_component_slot($name, $vars = array())
+function get_component_slot($name, $vars = [])
 {
-    $viewInstance = sfContext::getInstance()->get('view_instance');
+    $viewInstance = \sfContext::getInstance()->get('view_instance');
 
     if (!$viewInstance->hasComponentSlot($name)) {
         // cannot find component slot
-        throw new sfConfigurationException(sprintf('The component slot "%s" is not set.', $name));
+        throw new \sfConfigurationException(sprintf('The component slot "%s" is not set.', $name));
     }
 
     if ($componentSlot = $viewInstance->getComponentSlot($name)) {
@@ -76,7 +77,7 @@ function get_component_slot($name, $vars = array())
  */
 function has_component_slot($name)
 {
-    $viewInstance = sfContext::getInstance()->get('view_instance');
+    $viewInstance = \sfContext::getInstance()->get('view_instance');
 
     // check to see if one is defined
     if (!$viewInstance->hasComponentSlot($name)) {
@@ -107,7 +108,7 @@ function has_component_slot($name)
  *
  * @see    get_component, include_partial, include_component_slot
  */
-function include_component($moduleName, $componentName, $vars = array())
+function include_component($moduleName, $componentName, $vars = [])
 {
     echo get_component($moduleName, $componentName, $vars);
 }
@@ -127,18 +128,18 @@ function include_component($moduleName, $componentName, $vars = array())
  *
  * @return string result of the component execution
  *
- * @see    include_component
+ * @see    \include_component
  */
-function get_component($moduleName, $componentName, $vars = array())
+function get_component($moduleName, $componentName, $vars = [])
 {
-    $context = sfContext::getInstance();
+    $context = \sfContext::getInstance();
     $actionName = '_'.$componentName;
 
     require $context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml');
 
-    $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
+    $class = \sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
     $view = new $class($context, $moduleName, $actionName, '');
-    $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
+    $view->setPartialVars(true === \sfConfig::get('sf_escaping_strategy') ? \sfOutputEscaper::unescape($vars) : $vars);
 
     if ($retval = $view->getCache()) {
         return $retval;
@@ -173,7 +174,7 @@ function get_component($moduleName, $componentName, $vars = array())
  *
  * @see    get_partial, include_component
  */
-function include_partial($templateName, $vars = array())
+function include_partial($templateName, $vars = [])
 {
     echo get_partial($templateName, $vars);
 }
@@ -192,11 +193,11 @@ function include_partial($templateName, $vars = array())
  *
  * @return string result of the partial execution
  *
- * @see    include_partial
+ * @see    \include_partial
  */
-function get_partial($templateName, $vars = array())
+function get_partial($templateName, $vars = [])
 {
-    $context = sfContext::getInstance();
+    $context = \sfContext::getInstance();
 
     // partial is in another module?
     if (false !== $sep = strpos($templateName, '/')) {
@@ -207,9 +208,9 @@ function get_partial($templateName, $vars = array())
     }
     $actionName = '_'.$templateName;
 
-    $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
+    $class = \sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
     $view = new $class($context, $moduleName, $actionName, '');
-    $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
+    $view->setPartialVars(true === \sfConfig::get('sf_escaping_strategy') ? \sfOutputEscaper::unescape($vars) : $vars);
 
     return $view->render();
 }
@@ -220,20 +221,20 @@ function get_partial($templateName, $vars = array())
  * @param string $name  slot name
  * @param string $value The slot content
  *
- * @see    end_slot
+ * @see    \end_slot
  */
 function slot($name, $value = null)
 {
-    $context = sfContext::getInstance();
+    $context = \sfContext::getInstance();
     $response = $context->getResponse();
 
-    $slot_names = sfConfig::get('symfony.view.slot_names', array());
+    $slot_names = \sfConfig::get('symfony.view.slot_names', []);
     if (in_array($name, $slot_names)) {
-        throw new sfCacheException(sprintf('A slot named "%s" is already started.', $name));
+        throw new \sfCacheException(sprintf('A slot named "%s" is already started.', $name));
     }
 
-    if (sfConfig::get('sf_logging_enabled')) {
-        $context->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array(sprintf('Set slot "%s"', $name))));
+    if (\sfConfig::get('sf_logging_enabled')) {
+        $context->getEventDispatcher()->notify(new \sfEvent(null, 'application.log', [sprintf('Set slot "%s"', $name)]));
     }
 
     if (null !== $value) {
@@ -245,7 +246,7 @@ function slot($name, $value = null)
     $slot_names[] = $name;
 
     $response->setSlot($name, '');
-    sfConfig::set('symfony.view.slot_names', $slot_names);
+    \sfConfig::set('symfony.view.slot_names', $slot_names);
 
     ob_start();
     ob_implicit_flush(0);
@@ -254,22 +255,22 @@ function slot($name, $value = null)
 /**
  * Stops the content capture and save the content in the slot.
  *
- * @see    slot
+ * @see    \slot
  */
 function end_slot()
 {
     $content = ob_get_clean();
 
-    $response = sfContext::getInstance()->getResponse();
-    $slot_names = sfConfig::get('symfony.view.slot_names', array());
+    $response = \sfContext::getInstance()->getResponse();
+    $slot_names = \sfConfig::get('symfony.view.slot_names', []);
     if (!$slot_names) {
-        throw new sfCacheException('No slot started.');
+        throw new \sfCacheException('No slot started.');
     }
 
     $name = array_pop($slot_names);
 
     $response->setSlot($name, $content);
-    sfConfig::set('symfony.view.slot_names', $slot_names);
+    \sfConfig::set('symfony.view.slot_names', $slot_names);
 }
 
 /**
@@ -283,7 +284,7 @@ function end_slot()
  */
 function has_slot($name)
 {
-    return array_key_exists($name, sfContext::getInstance()->getResponse()->getSlots());
+    return array_key_exists($name, \sfContext::getInstance()->getResponse()->getSlots());
 }
 
 /**
@@ -321,11 +322,11 @@ function include_slot($name, $default = '')
  */
 function get_slot($name, $default = '')
 {
-    $context = sfContext::getInstance();
+    $context = \sfContext::getInstance();
     $slots = $context->getResponse()->getSlots();
 
-    if (sfConfig::get('sf_logging_enabled')) {
-        $context->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array(sprintf('Get slot "%s"', $name))));
+    if (\sfConfig::get('sf_logging_enabled')) {
+        $context->getEventDispatcher()->notify(new \sfEvent(null, 'application.log', [sprintf('Get slot "%s"', $name)]));
     }
 
     return isset($slots[$name]) ? $slots[$name] : $default;
@@ -333,13 +334,13 @@ function get_slot($name, $default = '')
 
 function _call_component($moduleName, $componentName, $vars)
 {
-    $context = sfContext::getInstance();
+    $context = \sfContext::getInstance();
 
     $controller = $context->getController();
 
     if (!$controller->componentExists($moduleName, $componentName)) {
         // cannot find component
-        throw new sfConfigurationException(sprintf('The component does not exist: "%s", "%s".', $moduleName, $componentName));
+        throw new \sfConfigurationException(sprintf('The component does not exist: "%s", "%s".', $moduleName, $componentName));
     }
 
     // create an instance of the action
@@ -349,33 +350,33 @@ function _call_component($moduleName, $componentName, $vars)
     require $context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml');
 
     // pass unescaped vars to the component if escaping_strategy is set to true
-    $componentInstance->getVarHolder()->add(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
+    $componentInstance->getVarHolder()->add(true === \sfConfig::get('sf_escaping_strategy') ? \sfOutputEscaper::unescape($vars) : $vars);
 
     // dispatch component
     $componentToRun = 'execute'.ucfirst($componentName);
     if (!method_exists($componentInstance, $componentToRun)) {
         if (!method_exists($componentInstance, 'execute')) {
             // component not found
-            throw new sfInitializationException(sprintf('sfComponent initialization failed for module "%s", component "%s".', $moduleName, $componentName));
+            throw new \sfInitializationException(sprintf('sfComponent initialization failed for module "%s", component "%s".', $moduleName, $componentName));
         }
 
         $componentToRun = 'execute';
     }
 
-    if (sfConfig::get('sf_logging_enabled')) {
-        $context->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array(sprintf('Call "%s->%s()"', $moduleName, $componentToRun))));
+    if (\sfConfig::get('sf_logging_enabled')) {
+        $context->getEventDispatcher()->notify(new \sfEvent(null, 'application.log', [sprintf('Call "%s->%s()"', $moduleName, $componentToRun)]));
     }
 
     // run component
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
-        $timer = sfTimerManager::getTimer(sprintf('Component "%s/%s"', $moduleName, $componentName));
+    if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
+        $timer = \sfTimerManager::getTimer(sprintf('Component "%s/%s"', $moduleName, $componentName));
     }
 
     $retval = $componentInstance->{$componentToRun}($context->getRequest());
 
-    if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+    if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
         $timer->addTime();
     }
 
-    return sfView::NONE == $retval ? null : $componentInstance->getVarHolder()->getAll();
+    return \sfView::NONE == $retval ? null : $componentInstance->getVarHolder()->getAll();
 }
diff --git a/lib/helper/TagHelper.php b/lib/helper/TagHelper.php
index 35b7578a7..a4cbae071 100644
--- a/lib/helper/TagHelper.php
+++ b/lib/helper/TagHelper.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004 David Heinemeier Hansson
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -27,7 +27,7 @@
  *
  * @return string
  */
-function tag($name, $options = array(), $open = false)
+function tag($name, $options = [], $open = false)
 {
     if (!$name) {
         return '';
@@ -36,7 +36,7 @@ function tag($name, $options = array(), $open = false)
     return '<'.$name._tag_options($options).($open ? '>' : ' />');
 }
 
-function content_tag($name, $content = '', $options = array())
+function content_tag($name, $content = '', $options = [])
 {
     if (!$name) {
         return '';
@@ -84,7 +84,7 @@ function escape_javascript($javascript = '')
  */
 function escape_once($html)
 {
-    return fix_double_escape(htmlspecialchars($html, ENT_COMPAT, sfConfig::get('sf_charset')));
+    return fix_double_escape(htmlspecialchars($html, ENT_COMPAT, \sfConfig::get('sf_charset')));
 }
 
 /**
@@ -99,7 +99,7 @@ function fix_double_escape($escaped)
     return preg_replace('/&amp;([a-z]+|(#\d+)|(#x[\da-f]+));/i', '&$1;', $escaped);
 }
 
-function _tag_options($options = array())
+function _tag_options($options = [])
 {
     $options = _parse_attributes($options);
 
@@ -113,7 +113,7 @@ function _tag_options($options = array())
 
 function _parse_attributes($string)
 {
-    return is_array($string) ? $string : sfToolkit::stringToArray($string);
+    return is_array($string) ? $string : \sfToolkit::stringToArray($string);
 }
 
 function _get_option(&$options, $name, $default = null)
@@ -153,8 +153,8 @@ function _get_option(&$options, $name, $default = null)
 function get_id_from_name($name, $value = null)
 {
     // check to see if we have an array variable for a field name
-    if (false !== strpos($name, '[')) {
-        $name = str_replace(array('[]', '][', '[', ']'), array((null != $value) ? '_'.$value : '', '_', '_', ''), $name);
+    if (str_contains($name, '[')) {
+        $name = str_replace(['[]', '][', '[', ']'], [(null != $value) ? '_'.$value : '', '_', '_', ''], $name);
     }
 
     return $name;
@@ -171,7 +171,7 @@ function _convert_options($options)
 {
     $options = _parse_attributes($options);
 
-    foreach (array('disabled', 'readonly', 'multiple') as $attribute) {
+    foreach (['disabled', 'readonly', 'multiple'] as $attribute) {
         if (array_key_exists($attribute, $options)) {
             if ($options[$attribute]) {
                 $options[$attribute] = $attribute;
diff --git a/lib/helper/TextHelper.php b/lib/helper/TextHelper.php
index b518fcf0c..2ad1b84bd 100644
--- a/lib/helper/TextHelper.php
+++ b/lib/helper/TextHelper.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004 David Heinemeier Hansson
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,8 +17,8 @@
  *
  * @version    SVN: $Id$
  *
- * @param mixed|null $truncate_pattern
- * @param mixed|null $length_max
+ * @param \mixed|null $truncate_pattern
+ * @param \mixed|null $length_max
  */
 
 /**
@@ -102,7 +102,7 @@ function highlight_text($text, $phrase, $highlighter = '<strong class="highlight
         return $text;
     }
 
-    if (is_array($phrase) or ($phrase instanceof sfOutputEscaperArrayDecorator)) {
+    if (is_array($phrase) or ($phrase instanceof \sfOutputEscaperArrayDecorator)) {
         foreach ($phrase as $word) {
             $pattern[] = '/('.preg_quote($word, '/').')/i';
             $replacement[] = $highlighter;
@@ -182,12 +182,12 @@ function wrap_text($text, $line_width = 80)
  * Two consecutive newlines(<tt>\n\n</tt>) are considered as a paragraph, one newline (<tt>\n</tt>) is
  * considered a linebreak, three or more consecutive newlines are turned into two newlines.
  */
-function simple_format_text($text, $options = array())
+function simple_format_text($text, $options = [])
 {
     $css = (isset($options['class'])) ? ' class="'.$options['class'].'"' : '';
 
-    $text = sfToolkit::pregtr($text, array("/(\r\n|\r)/" => "\n",               // lets make them newlines crossplatform
-        "/\n{2,}/" => "</p><p{$css}>"));    // turn two and more newlines into paragraph
+    $text = \sfToolkit::pregtr($text, ["/(\r\n|\r)/" => "\n",               // lets make them newlines crossplatform
+        "/\n{2,}/" => "</p><p{$css}>"]);    // turn two and more newlines into paragraph
 
     // turn single newline into <br/>
     $text = str_replace("\n", "\n<br />", $text);
@@ -204,7 +204,7 @@ function simple_format_text($text, $options = array())
  *     Go to <a href="http://www.symfony-project.com">http://www.symfony-project.com</a> and
  *     say hello to <a href="mailto:fabien.potencier@example.com">fabien.potencier@example.com</a>
  */
-function auto_link_text($text, $link = 'all', $href_options = array(), $truncate = false, $truncate_len = 35, $pad = '...')
+function auto_link_text($text, $link = 'all', $href_options = [], $truncate = false, $truncate_len = 35, $pad = '...')
 {
     if ('all' == $link) {
         return _auto_link_urls(_auto_link_email_addresses($text), $href_options, $truncate, $truncate_len, $pad);
@@ -251,7 +251,7 @@ function strip_links_text($text)
 /**
  * Turns all urls into clickable links.
  */
-function _auto_link_urls($text, $href_options = array(), $truncate = false, $truncate_len = 40, $pad = '...')
+function _auto_link_urls($text, $href_options = [], $truncate = false, $truncate_len = 40, $pad = '...')
 {
     $href_options = _tag_options($href_options);
 
diff --git a/lib/helper/UrlHelper.php b/lib/helper/UrlHelper.php
index 7f30dc77d..53d191a60 100644
--- a/lib/helper/UrlHelper.php
+++ b/lib/helper/UrlHelper.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,9 +20,9 @@
 /**
  * @ignore
  */
-function link_to2($name, $routeName, $params, $options = array())
+function link_to2($name, $routeName, $params, $options = [])
 {
-    $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : $params);
+    $params = array_merge(['sf_route' => $routeName], is_object($params) ? ['sf_subject' => $params] : $params);
 
     return link_to1($name, $params, $options);
 }
@@ -29,7 +30,7 @@ function link_to2($name, $routeName, $params, $options = array())
 /**
  * @ignore
  */
-function link_to1($name, $internal_uri, $options = array())
+function link_to1($name, $internal_uri, $options = [])
 {
     $html_options = _parse_attributes($options);
 
@@ -61,7 +62,7 @@ function link_to1($name, $internal_uri, $options = array())
         if (method_exists($name, '__toString')) {
             $name = $name->__toString();
         } else {
-            throw new sfException(sprintf('Object of class "%s" cannot be converted to string (Please create a __toString() method).', get_class($name)));
+            throw new \sfException(sprintf('Object of class "%s" cannot be converted to string (Please create a __toString() method).', get_class($name)));
         }
     }
 
@@ -75,9 +76,9 @@ function link_to1($name, $internal_uri, $options = array())
 /**
  * @ignore
  */
-function url_for2($routeName, $params = array(), $absolute = false)
+function url_for2($routeName, $params = [], $absolute = false)
 {
-    $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : $params);
+    $params = array_merge(['sf_route' => $routeName], is_object($params) ? ['sf_subject' => $params] : $params);
 
     return url_for1($params, $absolute);
 }
@@ -87,7 +88,7 @@ function url_for2($routeName, $params = array(), $absolute = false)
  */
 function url_for1($internal_uri, $absolute = false)
 {
-    return sfContext::getInstance()->getController()->genUrl($internal_uri, $absolute);
+    return \sfContext::getInstance()->getController()->genUrl($internal_uri, $absolute);
 }
 
 /**
@@ -110,7 +111,7 @@ function url_for()
 {
     // for BC with 1.1
     $arguments = func_get_args();
-    if (is_array($arguments[0]) || '@' == substr($arguments[0], 0, 1) || false !== strpos($arguments[0], '/')) {
+    if (is_array($arguments[0]) || '@' == substr($arguments[0], 0, 1) ||   str_contains($arguments[0], '/')) {
         return call_user_func_array('url_for1', $arguments);
     }
 
@@ -152,24 +153,24 @@ function url_for()
  *
  * @return string XHTML compliant <a href> tag
  *
- * @see    url_for
+ * @see    \url_for
  */
 function link_to()
 {
     // for BC with 1.1
     $arguments = func_get_args();
-    if (empty($arguments[1]) || is_array($arguments[1]) || '@' == substr($arguments[1], 0, 1) || false !== strpos($arguments[1], '/')) {
+    if (empty($arguments[1]) || is_array($arguments[1]) || '@' == substr($arguments[1], 0, 1) ||   str_contains($arguments[1], '/')) {
         return call_user_func_array('link_to1', $arguments);
     }
 
     if (!array_key_exists(2, $arguments)) {
-        $arguments[2] = array();
+        $arguments[2] = [];
     }
 
     return call_user_func_array('link_to2', $arguments);
 }
 
-function url_for_form(sfFormObject $form, $routePrefix)
+function url_for_form(\sfFormObject $form, $routePrefix)
 {
     $format = '%s/%s';
     if ('@' == $routePrefix[0]) {
@@ -182,7 +183,7 @@ function url_for_form(sfFormObject $form, $routePrefix)
     return url_for($uri, $form->getObject());
 }
 
-function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
+function form_tag_for(\sfForm $form, $routePrefix, $attributes = [])
 {
     return $form->renderFormTag(url_for_form($form, $routePrefix), $attributes);
 }
@@ -212,16 +213,16 @@ function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
  *
  * @return string XHTML compliant <a href> tag or name
  *
- * @see    link_to
+ * @see    \link_to
  */
 function link_to_if()
 {
     $arguments = func_get_args();
-    if (empty($arguments[2]) || '@' == substr($arguments[2], 0, 1) || false !== strpos($arguments[2], '/')) {
+    if (empty($arguments[2]) || '@' == substr($arguments[2], 0, 1) ||   str_contains($arguments[2], '/')) {
         list($condition, $name, $params, $options) = array_pad($arguments, 4, null);
     } else {
         list($condition, $name, $routeName, $params, $options) = array_pad($arguments, 5, null);
-        $params = array_merge(array('sf_route' => $routeName), is_object($params) ? array('sf_subject' => $params) : (array) $params);
+        $params = array_merge(['sf_route' => $routeName], is_object($params) ? ['sf_subject' => $params] : (array) $params);
     }
 
     $html_options = _parse_attributes($options);
@@ -263,7 +264,7 @@ function link_to_if()
  *
  * @return string XHTML compliant <a href> tag or name
  *
- * @see    link_to
+ * @see    \link_to
  */
 function link_to_unless()
 {
@@ -279,11 +280,11 @@ function link_to_unless()
  * @param string $path     The route to append
  * @param bool   $absolute If true, an absolute path is returned (optional)
  *
- * @return The web URL root
+ * @return \The web URL root
  */
 function public_path($path, $absolute = false)
 {
-    $request = sfContext::getInstance()->getRequest();
+    $request = \sfContext::getInstance()->getRequest();
     $root = $request->getRelativeUrlRoot();
 
     if ($absolute) {
@@ -330,20 +331,20 @@ function public_path($path, $absolute = false)
  *
  * @see    url_for, link_to
  */
-function button_to($name, $internal_uri, $options = array())
+function button_to($name, $internal_uri, $options = [])
 {
     $html_options = _parse_attributes($options);
     $html_options['value'] = $name;
 
     if (isset($html_options['post']) && $html_options['post']) {
         if (isset($html_options['popup'])) {
-            throw new sfConfigurationException('You can\'t use "popup" and "post" together.');
+            throw new \sfConfigurationException('You can\'t use "popup" and "post" together.');
         }
         $html_options['type'] = 'submit';
         unset($html_options['post']);
         $html_options = _convert_options_to_javascript($html_options);
 
-        return form_tag($internal_uri, array('method' => 'post', 'class' => 'button_to')).content_tag('div', tag('input', $html_options)).'</form>';
+        return form_tag($internal_uri, ['method' => 'post', 'class' => 'button_to']).content_tag('div', tag('input', $html_options)).'</form>';
     }
 
     $url = url_for($internal_uri);
@@ -388,7 +389,7 @@ function button_to($name, $internal_uri, $options = array())
  *
  * @return string opening HTML <form> tag with options
  */
-function form_tag($url_for_options = '', $options = array())
+function form_tag($url_for_options = '', $options = [])
 {
     $options = _parse_attributes($options);
 
@@ -403,8 +404,8 @@ function form_tag($url_for_options = '', $options = array())
     $html_options['action'] = url_for($url_for_options);
 
     $html = '';
-    if (!in_array($html_options['method'], array('get', 'post'))) {
-        $html = tag('input', array('type' => 'hidden', 'name' => 'sf_method', 'value' => $html_options['method']));
+    if (!in_array($html_options['method'], ['get', 'post'])) {
+        $html = tag('input', ['type' => 'hidden', 'name' => 'sf_method', 'value' => $html_options['method']]);
         $html_options['method'] = 'post';
     }
 
@@ -440,16 +441,16 @@ function form_tag($url_for_options = '', $options = array())
  *
  * @return string XHTML compliant <a href> tag
  *
- * @see    link_to
+ * @see    \link_to
  */
-function mail_to($email, $name = '', $options = array(), $default_value = array())
+function mail_to($email, $name = '', $options = [], $default_value = [])
 {
     $html_options = _parse_attributes($options);
 
     $html_options = _convert_options_to_javascript($html_options);
 
     $default_tmp = _parse_attributes($default_value);
-    $default = array();
+    $default = [];
     foreach ($default_tmp as $key => $value) {
         $default[] = urlencode($key).'='.urlencode($value);
     }
@@ -488,7 +489,7 @@ function _convert_options_to_javascript($html_options, $url = 'this.href')
     $onclick = isset($html_options['onclick']) ? $html_options['onclick'] : '';
 
     if ($popup && $method) {
-        throw new sfConfigurationException('You can\'t use "popup", "method" and "post" in the same link.');
+        throw new \sfConfigurationException('You can\'t use "popup", "method" and "post" in the same link.');
     }
     if ($confirm && $popup) {
         $html_options['onclick'] = $onclick.'if ('._confirm_javascript_function($confirm).') { '._popup_javascript_function($popup, $url).' };return false;';
@@ -542,7 +543,7 @@ function _method_javascript_function($method)
     }
 
     // CSRF protection
-    $form = new BaseForm();
+    $form = new \BaseForm();
     if ($form->isCSRFProtected()) {
         $function .= "var m = document.createElement('input'); m.setAttribute('type', 'hidden'); ";
         $function .= sprintf("m.setAttribute('name', '%s'); m.setAttribute('value', '%s'); f.appendChild(m);", $form->getCSRFFieldName(), $form->getCSRFToken());
diff --git a/lib/i18n/Gettext/MO.php b/lib/i18n/Gettext/MO.php
index 3c43306e4..ffca4a3dc 100644
--- a/lib/i18n/Gettext/MO.php
+++ b/lib/i18n/Gettext/MO.php
@@ -1,6 +1,14 @@
 <?php
 
-// +----------------------------------------------------------------------+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 // | PEAR :: File :: Gettext :: MO                                        |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 3.0 of the PHP license,       |
@@ -31,7 +39,7 @@
  *
  * @version     $Revision: 9856 $
  */
-class TGettext_MO extends TGettext
+class TGettext_MO extends \TGettext
 {
     /**
      * file handle.
@@ -201,23 +209,23 @@ public function load($file = null)
         // move to msgid hash table
         fseek($this->_handle, $offset_original);
         // read lengths and offsets of msgids
-        $original = array();
+        $original = [];
         for ($i = 0; $i < $count; ++$i) {
-            $original[$i] = array(
+            $original[$i] = [
                 'length' => $this->_readInt($be),
                 'offset' => $this->_readInt($be),
-            );
+            ];
         }
 
         // move to msgstr hash table
         fseek($this->_handle, $offset_translat);
         // read lengths and offsets of msgstrs
-        $translat = array();
+        $translat = [];
         for ($i = 0; $i < $count; ++$i) {
-            $translat[$i] = array(
+            $translat[$i] = [
                 'length' => $this->_readInt($be),
                 'offset' => $this->_readInt($be),
-            );
+            ];
         }
 
         // read all
@@ -299,7 +307,7 @@ public function save($file = null)
             foreach ($this->meta as $key => $val) {
                 $meta .= $key.': '.$val."\n";
             }
-            $strings = array('' => $meta) + $this->strings;
+            $strings = ['' => $meta] + $this->strings;
         } else {
             $strings = $this->strings;
         }
diff --git a/lib/i18n/Gettext/PO.php b/lib/i18n/Gettext/PO.php
index ff4c1eec8..d3f2ea372 100644
--- a/lib/i18n/Gettext/PO.php
+++ b/lib/i18n/Gettext/PO.php
@@ -1,6 +1,14 @@
 <?php
 
-// +----------------------------------------------------------------------+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 // | PEAR :: File :: Gettext :: PO                                        |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 3.0 of the PHP license,       |
@@ -31,7 +39,7 @@
  *
  * @version     $Revision: 9856 $
  */
-class TGettext_PO extends TGettext
+class TGettext_PO extends \TGettext
 {
     /**
      * Constructor.
diff --git a/lib/i18n/Gettext/TGettext.class.php b/lib/i18n/Gettext/TGettext.class.php
index 73c33f011..cd7c220a3 100644
--- a/lib/i18n/Gettext/TGettext.class.php
+++ b/lib/i18n/Gettext/TGettext.class.php
@@ -1,6 +1,14 @@
 <?php
 
-// +----------------------------------------------------------------------+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 // | PEAR :: File :: Gettext                                              |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 3.0 of the PHP license,       |
@@ -48,7 +56,7 @@ class TGettext
      *
      * @var array
      */
-    protected $strings = array();
+    protected $strings = [];
 
     /**
      * meta.
@@ -58,7 +66,7 @@ class TGettext
      *
      * @var array
      */
-    protected $meta = array();
+    protected $meta = [];
 
     /**
      * file path.
@@ -83,7 +91,7 @@ public static function factory($format, $file = '')
         $format = strtoupper($format);
         $filename = __DIR__.'/'.$format.'.php';
         if (false == is_file($filename)) {
-            throw new Exception("Class file {$file} not found");
+            throw new \Exception("Class file {$file} not found");
         }
 
         include_once $filename;
@@ -108,12 +116,12 @@ public static function factory($format, $file = '')
     public function poFile2moFile($pofile, $mofile)
     {
         if (!is_file($pofile)) {
-            throw new Exception("File {$pofile} doesn't exist.");
+            throw new \Exception("File {$pofile} doesn't exist.");
         }
 
         include_once __DIR__.'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
+        $PO = new \TGettext_PO($pofile);
         if (true !== ($e = $PO->load())) {
             return $e;
         }
@@ -140,14 +148,14 @@ public function poFile2moFile($pofile, $mofile)
     public function prepare($string, $reverse = false)
     {
         if ($reverse) {
-            $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"'."\n".'"', '\\t', '\\r');
+            $smap = ['"', "\n", "\t", "\r"];
+            $rmap = ['\"', '\\n"'."\n".'"', '\\t', '\\r'];
 
             return (string) str_replace($smap, $rmap, $string);
         }
         $string = preg_replace('/"\s+"/', '', $string);
-        $smap = array('\\n', '\\r', '\\t', '\"');
-        $rmap = array("\n", "\r", "\t", '"');
+        $smap = ['\\n', '\\r', '\\t', '\"'];
+        $rmap = ["\n", "\r", "\t", '"'];
 
         return (string) str_replace($smap, $rmap, $string);
     }
@@ -163,7 +171,7 @@ public function prepare($string, $reverse = false)
      */
     public function meta2array($meta)
     {
-        $array = array();
+        $array = [];
         foreach (explode("\n", $meta) as $info) {
             if ($info = trim($info)) {
                 list($key, $value) = explode(':', $info, 2);
@@ -200,7 +208,7 @@ public function meta2array($meta)
      */
     public function toArray()
     {
-        return array('meta' => $this->meta, 'strings' => $this->strings);
+        return ['meta' => $this->meta, 'strings' => $this->strings];
     }
 
     /**
@@ -252,7 +260,7 @@ public function fromArray($array)
     public function toMO()
     {
         include_once __DIR__.'/MO.php';
-        $MO = new TGettext_MO();
+        $MO = new \TGettext_MO();
         $MO->fromArray($this->toArray());
 
         return $MO;
@@ -266,7 +274,7 @@ public function toMO()
     public function toPO()
     {
         include_once __DIR__.'/PO.php';
-        $PO = new TGettext_PO();
+        $PO = new \TGettext_PO();
         $PO->fromArray($this->toArray());
 
         return $PO;
diff --git a/lib/i18n/extract/sfI18nApplicationExtract.class.php b/lib/i18n/extract/sfI18nApplicationExtract.class.php
index 1e5bd9d66..110e169ae 100644
--- a/lib/i18n/extract/sfI18nApplicationExtract.class.php
+++ b/lib/i18n/extract/sfI18nApplicationExtract.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,21 +14,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nApplicationExtract extends sfI18nExtract
+class sfI18nApplicationExtract extends \sfI18nExtract
 {
-    protected $extractObjects = array();
+    protected $extractObjects = [];
 
     /**
      * Configures the current extract object.
      */
     public function configure()
     {
-        $this->extractObjects = array();
+        $this->extractObjects = [];
 
         // Modules
-        $moduleNames = sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_app_module_dir'));
+        $moduleNames = \sfFinder::type('dir')->maxdepth(0)->relative()->in(\sfConfig::get('sf_app_module_dir'));
         foreach ($moduleNames as $moduleName) {
-            $this->extractObjects[] = new sfI18nModuleExtract($this->i18n, $this->culture, array('module' => $moduleName));
+            $this->extractObjects[] = new \sfI18nModuleExtract($this->i18n, $this->culture, ['module' => $moduleName]);
         }
     }
 
@@ -43,10 +44,10 @@ public function extract()
         }
 
         // Add global templates
-        $this->extractFromPhpFiles(sfConfig::get('sf_app_template_dir'));
+        $this->extractFromPhpFiles(\sfConfig::get('sf_app_template_dir'));
 
         // Add global librairies
-        $this->extractFromPhpFiles(sfConfig::get('sf_app_lib_dir'));
+        $this->extractFromPhpFiles(\sfConfig::get('sf_app_lib_dir'));
     }
 
     /**
@@ -67,7 +68,7 @@ public function getAllSeenMessages()
 
     protected function aggregateMessages($method)
     {
-        $messages = array();
+        $messages = [];
         foreach ($this->extractObjects as $extractObject) {
             $messages = array_merge($messages, $extractObject->{$method}());
         }
diff --git a/lib/i18n/extract/sfI18nExtract.class.php b/lib/i18n/extract/sfI18nExtract.class.php
index 3c041d3e4..8344b01c8 100644
--- a/lib/i18n/extract/sfI18nExtract.class.php
+++ b/lib/i18n/extract/sfI18nExtract.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,11 +16,11 @@
  */
 abstract class sfI18nExtract
 {
-    protected $currentMessages = array();
-    protected $newMessages = array();
-    protected $allSeenMessages = array();
+    protected $currentMessages = [];
+    protected $newMessages = [];
+    protected $allSeenMessages = [];
     protected $culture;
-    protected $parameters = array();
+    protected $parameters = [];
     protected $i18n;
 
     /**
@@ -27,7 +28,7 @@ abstract class sfI18nExtract
      *
      * @see initialize()
      */
-    public function __construct(sfI18N $i18n, $culture, $parameters = array())
+    public function __construct(\sfI18N $i18n, $culture, $parameters = [])
     {
         $this->initialize($i18n, $culture, $parameters);
     }
@@ -35,15 +36,15 @@ public function __construct(sfI18N $i18n, $culture, $parameters = array())
     /**
      * Initializes the current extract object.
      *
-     * @param sfI18N $i18n       A sfI18N instance
-     * @param string $culture    The culture
-     * @param array  $parameters An array of parameters
+     * @param \sfI18N $i18n       A sfI18N instance
+     * @param string  $culture    The culture
+     * @param array   $parameters An array of parameters
      */
-    public function initialize(sfI18N $i18n, $culture, $parameters = array())
+    public function initialize(\sfI18N $i18n, $culture, $parameters = [])
     {
-        $this->allSeenMessages = array();
-        $this->newMessages = array();
-        $this->currentMessages = array();
+        $this->allSeenMessages = [];
+        $this->newMessages = [];
+        $this->currentMessages = [];
 
         $this->culture = $culture;
         $this->parameters = $parameters;
@@ -157,7 +158,7 @@ protected function loadMessageSources()
      */
     protected function loadCurrentMessages()
     {
-        $this->currentMessages = array();
+        $this->currentMessages = [];
         foreach ($this->i18n->getMessageSource()->read() as $catalogue => $translations) {
             foreach ($translations as $key => $values) {
                 $this->currentMessages[] = $key;
@@ -172,10 +173,10 @@ protected function loadCurrentMessages()
      */
     protected function extractFromPhpFiles($dir)
     {
-        $phpExtractor = new sfI18nPhpExtractor();
+        $phpExtractor = new \sfI18nPhpExtractor();
 
-        $files = sfFinder::type('file')->name('*.php');
-        $messages = array();
+        $files = \sfFinder::type('file')->name('*.php');
+        $messages = [];
         foreach ($files->in($dir) as $file) {
             $messages = array_merge($messages, $phpExtractor->extract(file_get_contents($file)));
         }
diff --git a/lib/i18n/extract/sfI18nExtractorInterface.class.php b/lib/i18n/extract/sfI18nExtractorInterface.class.php
index 75082385f..06af66985 100644
--- a/lib/i18n/extract/sfI18nExtractorInterface.class.php
+++ b/lib/i18n/extract/sfI18nExtractorInterface.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/i18n/extract/sfI18nModuleExtract.class.php b/lib/i18n/extract/sfI18nModuleExtract.class.php
index 8ac605b87..9252b7bd4 100644
--- a/lib/i18n/extract/sfI18nModuleExtract.class.php
+++ b/lib/i18n/extract/sfI18nModuleExtract.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nModuleExtract extends sfI18nExtract
+class sfI18nModuleExtract extends \sfI18nExtract
 {
     protected $module = '';
 
@@ -23,7 +24,7 @@ class sfI18nModuleExtract extends sfI18nExtract
     public function configure()
     {
         if (!isset($this->parameters['module'])) {
-            throw new sfException('You must give a "module" parameter when extracting for a module.');
+            throw new \sfException('You must give a "module" parameter when extracting for a module.');
         }
 
         $this->module = $this->parameters['module'];
@@ -41,17 +42,17 @@ public function configure()
     public function extract()
     {
         // Extract from PHP files to find __() calls in actions/ lib/ and templates/ directories
-        $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$this->module;
-        $this->extractFromPhpFiles(array(
+        $moduleDir = \sfConfig::get('sf_app_module_dir').'/'.$this->module;
+        $this->extractFromPhpFiles([
             $moduleDir.'/actions',
             $moduleDir.'/lib',
             $moduleDir.'/templates',
-        ));
+        ]);
 
         // Extract from generator.yml files
         $generator = $moduleDir.'/config/generator.yml';
         if (file_exists($generator)) {
-            $yamlExtractor = new sfI18nYamlGeneratorExtractor();
+            $yamlExtractor = new \sfI18nYamlGeneratorExtractor();
             $this->updateMessages($yamlExtractor->extract(file_get_contents($generator)));
         }
 
@@ -59,7 +60,7 @@ public function extract()
         $validateFiles = glob($moduleDir.'/validate/*.yml');
         if (is_array($validateFiles)) {
             foreach ($validateFiles as $validateFile) {
-                $yamlExtractor = new sfI18nYamlValidateExtractor();
+                $yamlExtractor = new \sfI18nYamlValidateExtractor();
                 $this->updateMessages($yamlExtractor->extract(file_get_contents($validateFile)));
             }
         }
diff --git a/lib/i18n/extract/sfI18nPhpExtractor.class.php b/lib/i18n/extract/sfI18nPhpExtractor.class.php
index 4051795a1..680e09b57 100644
--- a/lib/i18n/extract/sfI18nPhpExtractor.class.php
+++ b/lib/i18n/extract/sfI18nPhpExtractor.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nPhpExtractor implements sfI18nExtractorInterface
+class sfI18nPhpExtractor implements \sfI18nExtractorInterface
 {
     /**
      * Extract i18n strings for the given content.
@@ -26,7 +27,7 @@ public function extract($content)
     {
         $tokens = token_get_all($content);
 
-        $strings = array();
+        $strings = [];
         $i18n_function = 0;
         $line = 0;
         $heredoc = false;
diff --git a/lib/i18n/extract/sfI18nYamlExtractor.class.php b/lib/i18n/extract/sfI18nYamlExtractor.class.php
index c11f3b48c..537a413a5 100644
--- a/lib/i18n/extract/sfI18nYamlExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlExtractor.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,6 +14,6 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface
+abstract class sfI18nYamlExtractor implements \sfI18nExtractorInterface
 {
 }
diff --git a/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php b/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
index 2f6b14d32..74b8a447f 100644
--- a/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,9 +14,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nYamlGeneratorExtractor extends sfI18nYamlExtractor
+class sfI18nYamlGeneratorExtractor extends \sfI18nYamlExtractor
 {
-    protected $strings = array();
+    protected $strings = [];
 
     /**
      * Extract i18n strings for the given content.
@@ -26,18 +27,18 @@ class sfI18nYamlGeneratorExtractor extends sfI18nYamlExtractor
      */
     public function extract($content)
     {
-        $this->strings = array();
+        $this->strings = [];
 
-        $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
+        $config = \sfYaml::load($content, \sfConfig::get('sf_charset', 'UTF-8'));
 
         if (!isset($config['generator']['param']['config'])) {
-            return array();
+            return [];
         }
 
         $params = $config['generator']['param']['config'];
 
         // titles
-        foreach (array('list', 'edit', 'new') as $section) {
+        foreach (['list', 'edit', 'new'] as $section) {
             if (isset($params[$section]['title'])) {
                 $this->strings[] = $params[$section]['title'];
             }
@@ -61,7 +62,7 @@ public function extract($content)
         }
 
         // form categories
-        foreach (array('edit', 'new') as $section) {
+        foreach (['edit', 'new'] as $section) {
             if (isset($params[$section]['display']) && !isset($params[$section]['display'][0])) {
                 foreach (array_keys($params[$section]['display']) as $string) {
                     if ('NONE' != $string) {
diff --git a/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php b/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
index 1b337ab3a..9ff66f5ea 100644
--- a/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
+++ b/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nYamlValidateExtractor extends sfI18nYamlExtractor
+class sfI18nYamlValidateExtractor extends \sfI18nYamlExtractor
 {
     /**
      * Extract i18n strings for the given content.
@@ -24,9 +25,9 @@ class sfI18nYamlValidateExtractor extends sfI18nYamlExtractor
      */
     public function extract($content)
     {
-        $strings = array();
+        $strings = [];
 
-        $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
+        $config = \sfYaml::load($content, \sfConfig::get('sf_charset', 'UTF-8'));
 
         // New validate.yml format
 
diff --git a/lib/i18n/sfChoiceFormat.class.php b/lib/i18n/sfChoiceFormat.class.php
index 6d922f1bb..130015358 100644
--- a/lib/i18n/sfChoiceFormat.class.php
+++ b/lib/i18n/sfChoiceFormat.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfChoiceFormat class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -85,14 +77,14 @@ public function __construct()
      *
      * @return bool true if number is in the set, false otherwise
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function isValid($number, $set)
     {
         $n = preg_match_all($this->validate, $set, $matches, PREG_SET_ORDER);
 
         if ($n < 3) {
-            throw new sfException(sprintf('Invalid set "%s".', $set));
+            throw new \sfException(sprintf('Invalid set "%s".', $set));
         }
 
         if (preg_match('/\{\s*n:([^\}]+)\}/', $set, $def)) {
@@ -103,7 +95,7 @@ public function isValid($number, $set)
         $rightBracket = $matches[$n - 1][0];
 
         $i = 0;
-        $elements = array();
+        $elements = [];
 
         foreach ($matches as $match) {
             $string = $match[0];
@@ -152,13 +144,13 @@ public function isValid($number, $set)
     public function parse($string)
     {
         $n = preg_match_all($this->parse, $string, $matches, PREG_OFFSET_CAPTURE);
-        $sets = array();
+        $sets = [];
         foreach ($matches[1] as $match) {
             $sets[] = $match[0];
         }
 
         $offset = $matches[0];
-        $strings = array();
+        $strings = [];
         for ($i = 0; $i < $n; ++$i) {
             $len = strlen($offset[$i][0]);
             $begin = 0 == $i ? $len : $offset[$i][1] + $len;
@@ -166,7 +158,7 @@ public function parse($string)
             $strings[] = substr($string, $begin, $end - $begin);
         }
 
-        return array($sets, $strings);
+        return [$sets, $strings];
     }
 
     /**
@@ -198,7 +190,7 @@ protected function isValidSetNotation($number, $set)
             eval($str);
 
             return $result;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
     }
diff --git a/lib/i18n/sfCultureInfo.class.php b/lib/i18n/sfCultureInfo.class.php
index da0a30c23..ea5035b8b 100644
--- a/lib/i18n/sfCultureInfo.class.php
+++ b/lib/i18n/sfCultureInfo.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfCultureInfo class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -88,7 +80,7 @@ class sfCultureInfo
      *
      * @var array
      */
-    protected $data = array();
+    protected $data = [];
 
     /**
      * The current culture.
@@ -109,19 +101,19 @@ class sfCultureInfo
      *
      * @var array
      */
-    protected $dataFiles = array();
+    protected $dataFiles = [];
 
     /**
      * The current date time format info.
      *
-     * @var sfDateTimeFormatInfo
+     * @var \sfDateTimeFormatInfo
      */
     protected $dateTimeFormat;
 
     /**
      * The current number format info.
      *
-     * @var sfNumberFormatInfo
+     * @var \sfNumberFormatInfo
      */
     protected $numberFormat;
 
@@ -130,7 +122,7 @@ class sfCultureInfo
      *
      * @var array
      */
-    protected $properties = array();
+    protected $properties = [];
 
     /**
      * Initializes a new instance of the sfCultureInfo class based on the
@@ -140,7 +132,7 @@ class sfCultureInfo
      *
      * @param string $culture a culture name, e.g. "en_AU".
      *
-     * @return return new sfCultureInfo
+     * @return \return new sfCultureInfo
      */
     public function __construct($culture = 'en')
     {
@@ -184,7 +176,7 @@ public function __get($name)
             return $this->{$getProperty}();
         }
 
-        throw new sfException(sprintf('Property %s does not exists.', $name));
+        throw new \sfException(sprintf('Property %s does not exists.', $name));
     }
 
     /**
@@ -200,7 +192,7 @@ public function __set($name, $value)
         if (in_array($setProperty, $this->properties)) {
             $this->{$setProperty}($value);
         } else {
-            throw new sfException(sprintf('Property %s can not be set.', $name));
+            throw new \sfException(sprintf('Property %s can not be set.', $name));
         }
     }
 
@@ -209,14 +201,14 @@ public function __set($name, $value)
      *
      * @param string $culture The culture for this instance
      *
-     * @return sfCultureInfo Invariant culture info is "en"
+     * @return \sfCultureInfo Invariant culture info is "en"
      */
     public static function getInstance($culture = 'en')
     {
-        static $instances = array();
+        static $instances = [];
 
         if (!isset($instances[$culture])) {
-            $instances[$culture] = new sfCultureInfo($culture);
+            $instances[$culture] = new \sfCultureInfo($culture);
         }
 
         return $instances[$culture];
@@ -254,14 +246,14 @@ public function getName()
      * Gets the sfDateTimeFormatInfo that defines the culturally appropriate
      * format of displaying dates and times.
      *
-     * @return sfDateTimeFormatInfo date time format information for the culture
+     * @return \sfDateTimeFormatInfo date time format information for the culture
      */
     public function getDateTimeFormat()
     {
         if (null === $this->dateTimeFormat) {
             $calendar = $this->getCalendar();
             $info = $this->findInfo("calendar/{$calendar}", true);
-            $this->setDateTimeFormat(new sfDateTimeFormatInfo($info));
+            $this->setDateTimeFormat(new \sfDateTimeFormatInfo($info));
         }
 
         return $this->dateTimeFormat;
@@ -270,7 +262,7 @@ public function getDateTimeFormat()
     /**
      * Sets the date time format information.
      *
-     * @param sfDateTimeFormatInfo $dateTimeFormat the new date time format info
+     * @param \sfDateTimeFormatInfo $dateTimeFormat the new date time format info
      */
     public function setDateTimeFormat($dateTimeFormat)
     {
@@ -336,14 +328,14 @@ public function getEnglishName()
      * instances of the invariant culture.
      * The invariant culture is assumed to be "en";.
      *
-     * @return sfCultureInfo invariant culture info is "en"
+     * @return \sfCultureInfo invariant culture info is "en"
      */
     public static function getInvariantCulture()
     {
         static $invariant;
 
         if (null === $invariant) {
-            $invariant = new sfCultureInfo();
+            $invariant = new \sfCultureInfo();
         }
 
         return $invariant;
@@ -365,7 +357,7 @@ public function getIsNeutralCulture()
      * Gets the sfNumberFormatInfo that defines the culturally appropriate
      * format of displaying numbers, currency, and percentage.
      *
-     * @return sfNumberFormatInfo the number format info for current culture
+     * @return \sfNumberFormatInfo the number format info for current culture
      */
     public function getNumberFormat()
     {
@@ -373,9 +365,9 @@ public function getNumberFormat()
             $elements = $this->findInfo('NumberElements');
             $patterns = $this->findInfo('NumberPatterns');
             $currencies = $this->getCurrencies(null, true);
-            $data = array('NumberElements' => $elements, 'NumberPatterns' => $patterns, 'Currencies' => $currencies);
+            $data = ['NumberElements' => $elements, 'NumberPatterns' => $patterns, 'Currencies' => $currencies];
 
-            $this->setNumberFormat(new sfNumberFormatInfo($data));
+            $this->setNumberFormat(new \sfNumberFormatInfo($data));
         }
 
         return $this->numberFormat;
@@ -384,7 +376,7 @@ public function getNumberFormat()
     /**
      * Sets the number format information.
      *
-     * @param sfNumberFormatInfo $numberFormat the new number format info
+     * @param \sfNumberFormatInfo $numberFormat the new number format info
      */
     public function setNumberFormat($numberFormat)
     {
@@ -395,7 +387,7 @@ public function setNumberFormat($numberFormat)
      * Gets the sfCultureInfo that represents the parent culture of the
      * current sfCultureInfo.
      *
-     * @return sfCultureInfo parent culture information
+     * @return \sfCultureInfo parent culture information
      */
     public function getParent()
     {
@@ -403,7 +395,7 @@ public function getParent()
             return $this->getInvariantCulture();
         }
 
-        return new sfCultureInfo(substr($this->culture, 0, 2));
+        return new \sfCultureInfo(substr($this->culture, 0, 2));
     }
 
     /**
@@ -417,14 +409,14 @@ public function getParent()
      *
      * @return array list of culture information available
      */
-    public static function getCultures($type = sfCultureInfo::ALL)
+    public static function getCultures($type = \sfCultureInfo::ALL)
     {
-        $dataDir = sfCultureInfo::dataDir();
-        $dataExt = sfCultureInfo::fileExt();
+        $dataDir = \sfCultureInfo::dataDir();
+        $dataExt = \sfCultureInfo::fileExt();
         $dir = dir($dataDir);
 
-        $neutral = array();
-        $specific = array();
+        $neutral = [];
+        $specific = [];
 
         while (false !== ($entry = $dir->read())) {
             if (is_file($dataDir.$entry) && substr($entry, -4) == $dataExt && $entry != 'root'.$dataExt) {
@@ -439,7 +431,7 @@ public static function getCultures($type = sfCultureInfo::ALL)
         $dir->close();
 
         switch ($type) {
-            case sfCultureInfo::ALL:
+            case \sfCultureInfo::ALL:
                 $all = array_merge($neutral, $specific);
                 sort($all);
 
@@ -447,12 +439,12 @@ public static function getCultures($type = sfCultureInfo::ALL)
 
                 break;
 
-            case sfCultureInfo::NEUTRAL:
+            case \sfCultureInfo::NEUTRAL:
                 return $neutral;
 
                 break;
 
-            case sfCultureInfo::SPECIFIC:
+            case \sfCultureInfo::SPECIFIC:
                 return $specific;
 
                 break;
@@ -471,7 +463,7 @@ public function getCountry($code)
         $countries = $this->findInfo('Countries', true);
 
         if (!isset($countries[$code])) {
-            throw new InvalidArgumentException(sprintf('The country %s does not exist.', $code));
+            throw new \InvalidArgumentException(sprintf('The country %s does not exist.', $code));
         }
 
         return $countries[$code];
@@ -489,7 +481,7 @@ public function getCurrency($code)
         $currencies = $this->findInfo('Currencies', true);
 
         if (!isset($currencies[$code])) {
-            throw new InvalidArgumentException(sprintf('The currency %s does not exist.', $code));
+            throw new \InvalidArgumentException(sprintf('The currency %s does not exist.', $code));
         }
 
         return $currencies[$code][1];
@@ -507,7 +499,7 @@ public function getLanguage($code)
         $languages = $this->findInfo('Languages', true);
 
         if (!isset($languages[$code])) {
-            throw new InvalidArgumentException(sprintf('The language %s does not exist.', $code));
+            throw new \InvalidArgumentException(sprintf('The language %s does not exist.', $code));
         }
 
         return $languages[$code];
@@ -523,7 +515,7 @@ public function getLanguage($code)
     public function getCountries($countries = null)
     {
         // remove integer keys as they do not represent countries
-        $allCountries = array();
+        $allCountries = [];
         foreach ($this->findInfo('Countries', true) as $key => $value) {
             if (!is_int($key)) {
                 $allCountries[$key] = $value;
@@ -533,7 +525,7 @@ public function getCountries($countries = null)
         // restrict countries to a sub-set
         if (null !== $countries) {
             if ($problems = array_diff($countries, array_keys($allCountries))) {
-                throw new InvalidArgumentException(sprintf('The following countries do not exist: %s.', implode(', ', $problems)));
+                throw new \InvalidArgumentException(sprintf('The following countries do not exist: %s.', implode(', ', $problems)));
             }
 
             $allCountries = array_intersect_key($allCountries, array_flip($countries));
@@ -559,13 +551,13 @@ public function getCurrencies($currencies = null, $full = false)
         // restrict countries to a sub-set
         if (null !== $currencies) {
             if ($problems = array_diff($currencies, array_keys($allCurrencies))) {
-                throw new InvalidArgumentException(sprintf('The following currencies do not exist: %s.', implode(', ', $problems)));
+                throw new \InvalidArgumentException(sprintf('The following currencies do not exist: %s.', implode(', ', $problems)));
             }
 
             $allCurrencies = array_intersect_key($allCurrencies, array_flip($currencies));
         }
 
-        $tmp = array();
+        $tmp = [];
         foreach ($allCurrencies as $key => $value) {
             $allCurrencies[$key] = $value[1];
             $tmp[$key] = $value[0];
@@ -575,7 +567,7 @@ public function getCurrencies($currencies = null, $full = false)
 
         if ($full) {
             foreach ($allCurrencies as $key => $value) {
-                $allCurrencies[$key] = array($tmp[$key], $value);
+                $allCurrencies[$key] = [$tmp[$key], $value];
             }
         }
 
@@ -596,7 +588,7 @@ public function getLanguages($languages = null)
         // restrict languages to a sub-set
         if (null !== $languages) {
             if ($problems = array_diff($languages, array_keys($allLanguages))) {
-                throw new InvalidArgumentException(sprintf('The following languages do not exist: %s.', implode(', ', $problems)));
+                throw new \InvalidArgumentException(sprintf('The following languages do not exist: %s.', implode(', ', $problems)));
             }
 
             $allLanguages = array_intersect_key($allLanguages, array_flip($languages));
@@ -682,7 +674,7 @@ protected function setCulture($culture)
     {
         if (!empty($culture)) {
             if (!preg_match('/^[a-z]{2}(_[A-Z]{2,5}){0,2}$/', $culture)) {
-                throw new sfException(sprintf('Invalid culture supplied: %s', $culture));
+                throw new \sfException(sprintf('Invalid culture supplied: %s', $culture));
             }
         }
 
@@ -699,7 +691,7 @@ protected function loadCultureData($culture)
         $file_parts = explode('_', $culture);
         $current_part = $file_parts[0];
 
-        $files = array($current_part);
+        $files = [$current_part];
 
         for ($i = 1, $max = count($file_parts); $i < $max; ++$i) {
             $current_part .= '_'.$file_parts[$i];
@@ -710,7 +702,7 @@ protected function loadCultureData($culture)
             $filename = $this->dataDir.$file.$this->dataFileExt;
 
             if (false == is_file($filename)) {
-                throw new sfException(sprintf('Data file for "%s" was not found.', $file));
+                throw new \sfException(sprintf('Data file for "%s" was not found.', $file));
             }
 
             if (false == in_array($filename, $this->dataFiles)) {
@@ -738,8 +730,8 @@ protected function loadCultureData($culture)
      */
     protected function &getData($filename)
     {
-        static $data = array();
-        static $files = array();
+        static $data = [];
+        static $files = [];
 
         if (!in_array($filename, $files)) {
             $data[$filename] = unserialize(file_get_contents($filename));
@@ -767,7 +759,7 @@ protected function &getData($filename)
      */
     protected function findInfo($path = '/', $merge = false)
     {
-        $result = array();
+        $result = [];
         foreach ($this->dataFiles as $section) {
             $info = $this->searchArray($this->data[$section], $path);
 
diff --git a/lib/i18n/sfDateFormat.class.php b/lib/i18n/sfDateFormat.class.php
index 51b8a6242..553174fd1 100644
--- a/lib/i18n/sfDateFormat.class.php
+++ b/lib/i18n/sfDateFormat.class.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * sfDateFormat class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -42,7 +35,7 @@ class sfDateFormat
      *
      * @var array
      */
-    protected $tokens = array(
+    protected $tokens = [
         'G' => 'Era',
         'y' => 'year',
         'M' => 'mon',
@@ -60,19 +53,19 @@ class sfDateFormat
         'k' => 'HourInDay',
         'K' => 'HourInAMPM',
         'z' => 'TimeZone',
-    );
+    ];
 
     /**
      * A list of methods, to be used by the token function calls.
      *
      * @var array
      */
-    protected $methods = array();
+    protected $methods = [];
 
     /**
      * The sfDateTimeFormatInfo, containing culture specific patterns and names.
      *
-     * @var sfDateTimeFormatInfo
+     * @var \sfDateTimeFormatInfo
      */
     protected $formatInfo;
 
@@ -81,18 +74,18 @@ class sfDateFormat
      *
      * @param mixed $formatInfo either, null, a sfCultureInfo instance, a DateTimeFormatInfo instance, or a locale
      *
-     * @return sfDateFormat instance
+     * @return \sfDateFormat instance
      */
     public function __construct($formatInfo = null)
     {
         if (null === $formatInfo) {
-            $this->formatInfo = sfDateTimeFormatInfo::getInvariantInfo();
-        } elseif ($formatInfo instanceof sfCultureInfo) {
+            $this->formatInfo = \sfDateTimeFormatInfo::getInvariantInfo();
+        } elseif ($formatInfo instanceof \sfCultureInfo) {
             $this->formatInfo = $formatInfo->DateTimeFormat;
-        } elseif ($formatInfo instanceof sfDateTimeFormatInfo) {
+        } elseif ($formatInfo instanceof \sfDateTimeFormatInfo) {
             $this->formatInfo = $formatInfo;
         } else {
-            $this->formatInfo = sfDateTimeFormatInfo::getInstance($formatInfo);
+            $this->formatInfo = \sfDateTimeFormatInfo::getInstance($formatInfo);
         }
 
         $this->methods = get_class_methods($this);
@@ -129,7 +122,7 @@ public function getDate($time, $pattern = null)
             $pattern = $this->getPattern($pattern);
             $tokens = $this->getTokens($pattern);
             $pregPattern = '';
-            $matchNames = array();
+            $matchNames = [];
             // current regex allows any char at the end. avoids duplicating [^\d]+ pattern
             // this could cause issues with utf character width
             $allowsAllChars = true;
@@ -164,7 +157,7 @@ public function getDate($time, $pattern = null)
             if ($isString) {
                 $numericalTime = @strtotime($time);
                 if (false === $numericalTime) {
-                    throw new sfException(sprintf('Impossible to parse date "%s" with format "%s".', $time, $pattern));
+                    throw new \sfException(sprintf('Impossible to parse date "%s" with format "%s".', $time, $pattern));
                 }
             } else {
                 $numericalTime = $time;
@@ -173,7 +166,7 @@ public function getDate($time, $pattern = null)
         }
 
         // we set default values for the time
-        foreach (array('hours', 'minutes', 'seconds') as $timeDiv) {
+        foreach (['hours', 'minutes', 'seconds'] as $timeDiv) {
             if (!isset($date[$timeDiv])) {
                 $date[$timeDiv] = 0;
             }
@@ -216,13 +209,13 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
                     if (in_array($fName, $this->methods)) {
                         $tokens[$i] = $this->{$fName}($date, $pattern);
                     } else {
-                        throw new sfException(sprintf('Function %s not found.', $function));
+                        throw new \sfException(sprintf('Function %s not found.', $function));
                     }
                 }
             }
         }
 
-        return sfToolkit::I18N_toEncoding(implode('', $tokens), $charset);
+        return \sfToolkit::I18N_toEncoding(implode('', $tokens), $charset);
     }
 
     /**
@@ -366,8 +359,8 @@ public function getInputPattern($pattern)
     {
         $pattern = $this->getPattern($pattern);
 
-        $pattern = strtr($pattern, array('yyyy' => 'Y', 'h' => 'H', 'z' => '', 'a' => ''));
-        $pattern = strtr($pattern, array('yy' => 'yyyy', 'Y' => 'yyyy'));
+        $pattern = strtr($pattern, ['yyyy' => 'Y', 'h' => 'H', 'z' => '', 'a' => '']);
+        $pattern = strtr($pattern, ['yy' => 'yyyy', 'Y' => 'yyyy']);
 
         return trim($pattern);
     }
@@ -399,7 +392,7 @@ protected function getFunctionName($token)
     protected function getTokens($pattern)
     {
         $char = null;
-        $tokens = array();
+        $tokens = [];
         $token = null;
 
         $text = false;
@@ -457,7 +450,7 @@ protected function getYear($date, $pattern = 'yyyy')
                 return $year;
 
             default:
-                throw new sfException('The pattern for year is either "y", "yy", "yyy" or "yyyy".');
+                throw new \sfException('The pattern for year is either "y", "yy", "yyy" or "yyyy".');
         }
     }
 
@@ -495,7 +488,7 @@ protected function getMon($date, $pattern = 'M')
                 return $this->formatInfo->NarrowMonthNames[$month - 1];
 
             default:
-                throw new sfException('The pattern for month is "M", "MM", "MMM", "MMMM", "MMMMM".');
+                throw new \sfException('The pattern for month is "M", "MM", "MMM", "MMMM", "MMMMM".');
         }
     }
 
@@ -539,7 +532,7 @@ protected function getWday($date, $pattern = 'EEEE')
                 break;
 
             default:
-                throw new sfException('The pattern for day of the week is "E", "EE", "EEE", or "EEEE".');
+                throw new \sfException('The pattern for day of the week is "E", "EE", "EEE", or "EEEE".');
         }
     }
 
@@ -567,7 +560,7 @@ protected function getMday($date, $pattern = 'd')
                 return $this->getWday($date);
 
             default:
-                throw new sfException('The pattern for day of the month is "d", "dd" or "dddd".');
+                throw new \sfException('The pattern for day of the month is "d", "dd" or "dddd".');
         }
     }
 
@@ -584,7 +577,7 @@ protected function getMday($date, $pattern = 'd')
     protected function getEra($date, $pattern = 'G')
     {
         if ('G' != $pattern) {
-            throw new sfException('The pattern for era is "G".');
+            throw new \sfException('The pattern for era is "G".');
         }
 
         return $this->formatInfo->getEra($date['year'] > 0 ? 1 : 0);
@@ -611,7 +604,7 @@ protected function getHours($date, $pattern = 'H')
                 return str_pad($hour, 2, '0', STR_PAD_LEFT);
 
             default:
-                throw new sfException('The pattern for 24 hour format is "H" or "HH".');
+                throw new \sfException('The pattern for 24 hour format is "H" or "HH".');
         }
     }
 
@@ -626,7 +619,7 @@ protected function getHours($date, $pattern = 'H')
     protected function getAMPM($date, $pattern = 'a')
     {
         if ('a' != $pattern) {
-            throw new sfException('The pattern for AM/PM marker is "a".');
+            throw new \sfException('The pattern for AM/PM marker is "a".');
         }
 
         return $this->formatInfo->AMPMMarkers[(int) ($date['hours'] / 12)];
@@ -654,7 +647,7 @@ protected function getHour12($date, $pattern = 'h')
                 return str_pad($hour, 2, '0', STR_PAD_LEFT);
 
             default:
-                throw new sfException('The pattern for 24 hour format is "H" or "HH".');
+                throw new \sfException('The pattern for 24 hour format is "H" or "HH".');
         }
     }
 
@@ -679,7 +672,7 @@ protected function getMinutes($date, $pattern = 'm')
                 return str_pad($minutes, 2, '0', STR_PAD_LEFT);
 
             default:
-                throw new sfException('The pattern for minutes is "m" or "mm".');
+                throw new \sfException('The pattern for minutes is "m" or "mm".');
         }
     }
 
@@ -704,7 +697,7 @@ protected function getSeconds($date, $pattern = 's')
                 return str_pad($seconds, 2, '0', STR_PAD_LEFT);
 
             default:
-                throw new sfException('The pattern for seconds is "s" or "ss".');
+                throw new \sfException('The pattern for seconds is "s" or "ss".');
         }
     }
 
@@ -731,7 +724,7 @@ protected function getTimeZone($date, $pattern = 'z')
                 $pattern = 'O';
                 // no break
             default:
-                throw new sfException('The pattern for time zone is "z" or "Z".');
+                throw new \sfException('The pattern for time zone is "z" or "Z".');
         }
 
         return @date($pattern, @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
@@ -748,7 +741,7 @@ protected function getTimeZone($date, $pattern = 'z')
     protected function getYday($date, $pattern = 'D')
     {
         if ('D' != $pattern) {
-            throw new sfException('The pattern for day in year is "D".');
+            throw new \sfException('The pattern for day in year is "D".');
         }
 
         return $date['yday'];
@@ -776,7 +769,7 @@ protected function getDayInMonth($date, $pattern = 'FF')
                 break;
 
             default:
-                throw new sfException('The pattern for day in month is "F" or "FF".');
+                throw new \sfException('The pattern for day in month is "F" or "FF".');
         }
     }
 
@@ -791,7 +784,7 @@ protected function getDayInMonth($date, $pattern = 'FF')
     protected function getWeekInYear($date, $pattern = 'w')
     {
         if ('w' != $pattern) {
-            throw new sfException('The pattern for week in year is "w".');
+            throw new \sfException('The pattern for week in year is "w".');
         }
 
         return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
@@ -808,7 +801,7 @@ protected function getWeekInYear($date, $pattern = 'w')
     protected function getWeekInMonth($date, $pattern = 'W')
     {
         if ('W' != $pattern) {
-            throw new sfException('The pattern for week in month is "W".');
+            throw new \sfException('The pattern for week in month is "W".');
         }
 
         return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
@@ -825,7 +818,7 @@ protected function getWeekInMonth($date, $pattern = 'W')
     protected function getHourInDay($date, $pattern = 'k')
     {
         if ('k' != $pattern) {
-            throw new sfException('The pattern for hour in day is "k".');
+            throw new \sfException('The pattern for hour in day is "k".');
         }
 
         return $date['hours'] + 1;
@@ -842,7 +835,7 @@ protected function getHourInDay($date, $pattern = 'k')
     protected function getHourInAMPM($date, $pattern = 'K')
     {
         if ('K' != $pattern) {
-            throw new sfException('The pattern for hour in AM/PM is "K".');
+            throw new \sfException('The pattern for hour in AM/PM is "K".');
         }
 
         return ($date['hours'] + 1) % 12;
diff --git a/lib/i18n/sfDateTimeFormatInfo.class.php b/lib/i18n/sfDateTimeFormatInfo.class.php
index ec8574f0c..9335b806a 100644
--- a/lib/i18n/sfDateTimeFormatInfo.class.php
+++ b/lib/i18n/sfDateTimeFormatInfo.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfDateTimeFormatInfo class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -74,12 +66,12 @@ class sfDateTimeFormatInfo
     /**
      * ICU date time formatting data.
      */
-    protected $data = array();
+    protected $data = [];
 
     /**
      * A list of properties that are accessable/writable.
      */
-    protected $properties = array();
+    protected $properties = [];
 
     /**
      * Initializes a new writable instance of the sfDateTimeFormatInfo class
@@ -92,12 +84,12 @@ class sfDateTimeFormatInfo
      *
      * @see getInstance()
      */
-    public function __construct($data = array())
+    public function __construct($data = [])
     {
         $this->properties = get_class_methods($this);
 
         if (empty($data)) {
-            throw new sfException('Please provide the ICU data to initialize.');
+            throw new \sfException('Please provide the ICU data to initialize.');
         }
 
         $this->data = $data;
@@ -114,7 +106,7 @@ public function __get($name)
             return $this->{$getProperty}();
         }
 
-        throw new sfException(sprintf('Property %s does not exists.', $name));
+        throw new \sfException(sprintf('Property %s does not exists.', $name));
     }
 
     /**
@@ -127,21 +119,21 @@ public function __set($name, $value)
         if (in_array($setProperty, $this->properties)) {
             $this->{$setProperty}($value);
         } else {
-            throw new sfException(sprintf('Property %s can not be set.', $name));
+            throw new \sfException(sprintf('Property %s can not be set.', $name));
         }
     }
 
     /**
      * Gets the default sfDateTimeFormatInfo that is culture-independent (invariant).
      *
-     * @return sfDateTimeFormatInfo default sfDateTimeFormatInfo
+     * @return \sfDateTimeFormatInfo default sfDateTimeFormatInfo
      */
     public static function getInvariantInfo()
     {
         static $invariant;
 
         if (null === $invariant) {
-            $invariant = sfCultureInfo::getInvariantCulture()->DateTimeFormat;
+            $invariant = \sfCultureInfo::getInvariantCulture()->DateTimeFormat;
         }
 
         return $invariant;
@@ -150,21 +142,21 @@ public static function getInvariantInfo()
     /**
      * Returns the sfDateTimeFormatInfo associated with the specified culture.
      *
-     * @param sfCultureInfo $culture the culture that gets the sfDateTimeFormat property
+     * @param \sfCultureInfo $culture the culture that gets the sfDateTimeFormat property
      *
-     * @return sfDateTimeFormatInfo sfDateTimeFormatInfo for the specified
-     *                              culture
+     * @return \sfDateTimeFormatInfo sfDateTimeFormatInfo for the specified
+     *                               culture
      */
     public static function getInstance($culture = null)
     {
-        if ($culture instanceof sfCultureInfo) {
+        if ($culture instanceof \sfCultureInfo) {
             return $culture->DateTimeFormat;
         }
         if (is_string($culture)) {
-            return sfCultureInfo::getInstance($culture)->DateTimeFormat;
+            return \sfCultureInfo::getInstance($culture)->DateTimeFormat;
         }
 
-        return sfCultureInfo::getInvariantCulture()->DateTimeFormat;
+        return \sfCultureInfo::getInvariantCulture()->DateTimeFormat;
     }
 
     /**
@@ -524,7 +516,7 @@ public function getDateTimeOrderPattern()
      */
     public function formatDateTime($date, $time)
     {
-        return str_replace(array('{0}', '{1}'), array($time, $date), $this->getDateTimeOrderPattern());
+        return str_replace(['{0}', '{1}'], [$time, $date], $this->getDateTimeOrderPattern());
     }
 
     /**
diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php
index 9c0332558..8d2a9fd77 100644
--- a/lib/i18n/sfI18N.class.php
+++ b/lib/i18n/sfI18N.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +21,7 @@ class sfI18N
     protected $configuration;
     protected $dispatcher;
     protected $cache;
-    protected $options = array();
+    protected $options = [];
     protected $culture = 'en';
     protected $messageSource;
     protected $messageFormat;
@@ -30,7 +31,7 @@ class sfI18N
      *
      * @see initialize()
      */
-    public function __construct(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
+    public function __construct(\sfApplicationConfiguration $configuration, \sfCache $cache = null, $options = [])
     {
         $this->initialize($configuration, $cache, $options);
     }
@@ -44,7 +45,7 @@ public function __construct(sfApplicationConfiguration $configuration, sfCache $
      *
      * @return string The translated string
      */
-    public function __($string, $args = array(), $catalogue = 'messages')
+    public function __($string, $args = [], $catalogue = 'messages')
     {
         return $this->getMessageFormat()->format($string, $args, $catalogue);
     }
@@ -61,11 +62,11 @@ public function __($string, $args = array(), $catalogue = 'messages')
      *  * untranslated_prefix: The prefix to use when a message is not translated
      *  * untranslated_suffix: The suffix to use when a message is not translated
      *
-     * @param sfApplicationConfiguration $configuration A sfApplicationConfiguration instance
-     * @param sfCache                    $cache         A sfCache instance
-     * @param array                      $options       An array of options
+     * @param \sfApplicationConfiguration $configuration A sfApplicationConfiguration instance
+     * @param \sfCache                    $cache         A sfCache instance
+     * @param array                       $options       An array of options
      */
-    public function initialize(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
+    public function initialize(\sfApplicationConfiguration $configuration, \sfCache $cache = null, $options = [])
     {
         $this->configuration = $configuration;
         $this->dispatcher = $configuration->getEventDispatcher();
@@ -76,18 +77,18 @@ public function initialize(sfApplicationConfiguration $configuration, sfCache $c
             unset($options['culture']);
         }
 
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'source' => 'XLIFF',
             'debug' => false,
             'database' => 'default',
             'untranslated_prefix' => '[T]',
             'untranslated_suffix' => '[/T]',
-        ), $options);
+        ], $options);
 
-        $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
+        $this->dispatcher->connect('user.change_culture', [$this, 'listenToChangeCultureEvent']);
 
         if ($this->isMessageSourceFileBased($this->options['source'])) {
-            $this->dispatcher->connect('controller.change_action', array($this, 'listenToChangeActionEvent'));
+            $this->dispatcher->connect('controller.change_action', [$this, 'listenToChangeActionEvent']);
         }
     }
 
@@ -104,7 +105,7 @@ public function getOptions()
     /**
      * Returns the configuration instance.
      *
-     * @return sfApplicationConfiguration An sfApplicationConfiguration instance
+     * @return \sfApplicationConfiguration An sfApplicationConfiguration instance
      */
     public function getConfiguration()
     {
@@ -122,7 +123,7 @@ public function setMessageSource($dirs, $culture = null)
         if (null === $dirs) {
             $this->messageSource = $this->createMessageSource();
         } else {
-            $this->messageSource = sfMessageSource::factory('Aggregate', array_map(array($this, 'createMessageSource'), $dirs));
+            $this->messageSource = \sfMessageSource::factory('Aggregate', array_map([$this, 'createMessageSource'], $dirs));
         }
 
         if (null !== $this->cache) {
@@ -143,11 +144,11 @@ public function setMessageSource($dirs, $culture = null)
      *
      * @param mixed $dir An array of i18n directories to create a XLIFF or gettext message source, null otherwise
      *
-     * @return sfMessageSource A sfMessageSource object
+     * @return \sfMessageSource A sfMessageSource object
      */
     public function createMessageSource($dir = null)
     {
-        return sfMessageSource::factory($this->options['source'], self::isMessageSourceFileBased($this->options['source']) ? $dir : $this->options['database']);
+        return \sfMessageSource::factory($this->options['source'], self::isMessageSourceFileBased($this->options['source']) ? $dir : $this->options['database']);
     }
 
     /**
@@ -185,7 +186,7 @@ public function setCulture($culture)
     /**
      * Gets the message source.
      *
-     * @return sfMessageSource A sfMessageSource object
+     * @return \sfMessageSource A sfMessageSource object
      */
     public function getMessageSource()
     {
@@ -200,15 +201,15 @@ public function getMessageSource()
     /**
      * Gets the message format.
      *
-     * @return sfMessageFormat A sfMessageFormat object
+     * @return \sfMessageFormat A sfMessageFormat object
      */
     public function getMessageFormat()
     {
         if (!isset($this->messageFormat)) {
-            $this->messageFormat = new sfMessageFormat($this->getMessageSource(), sfConfig::get('sf_charset'));
+            $this->messageFormat = new \sfMessageFormat($this->getMessageSource(), \sfConfig::get('sf_charset'));
 
             if ($this->options['debug']) {
-                $this->messageFormat->setUntranslatedPS(array($this->options['untranslated_prefix'], $this->options['untranslated_suffix']));
+                $this->messageFormat->setUntranslatedPS([$this->options['untranslated_prefix'], $this->options['untranslated_suffix']]);
             }
         }
 
@@ -225,7 +226,7 @@ public function getMessageFormat()
      */
     public function getCountry($iso, $culture = null)
     {
-        $c = sfCultureInfo::getInstance(null === $culture ? $this->culture : $culture);
+        $c = \sfCultureInfo::getInstance(null === $culture ? $this->culture : $culture);
         $countries = $c->getCountries();
 
         return (array_key_exists($iso, $countries)) ? $countries[$iso] : '';
@@ -240,7 +241,7 @@ public function getCountry($iso, $culture = null)
      */
     public function getNativeName($culture)
     {
-        return sfCultureInfo::getInstance($culture)->getNativeName();
+        return \sfCultureInfo::getInstance($culture)->getNativeName();
     }
 
     /**
@@ -277,22 +278,22 @@ public function getDateForCulture($date, $culture = null)
             return null;
         }
 
-        $dateFormatInfo = @sfDateTimeFormatInfo::getInstance(null === $culture ? $this->culture : $culture);
+        $dateFormatInfo = @\sfDateTimeFormatInfo::getInstance(null === $culture ? $this->culture : $culture);
         $dateFormat = $dateFormatInfo->getShortDatePattern();
 
         // We construct the regexp based on date format
         $dateRegexp = preg_replace('/[dmy]+/i', '(\d+)', preg_quote($dateFormat));
 
         // We parse date format to see where things are (m, d, y)
-        $a = array(
+        $a = [
             'd' => strpos($dateFormat, 'd'),
             'm' => strpos($dateFormat, 'M'),
             'y' => strpos($dateFormat, 'y'),
-        );
+        ];
         $tmp = array_flip($a);
         ksort($tmp);
         $i = 0;
-        $c = array();
+        $c = [];
         foreach ($tmp as $value) {
             $c[++$i] = $value;
         }
@@ -301,7 +302,7 @@ public function getDateForCulture($date, $culture = null)
         // We find all elements
         if (preg_match("~{$dateRegexp}~", $date, $matches)) {
             // We get matching timestamp
-            return array($matches[$datePositions['d']], $matches[$datePositions['m']], $matches[$datePositions['y']]);
+            return [$matches[$datePositions['d']], $matches[$datePositions['m']], $matches[$datePositions['y']]];
         }
 
         return null;
@@ -323,18 +324,18 @@ public function getTimeForCulture($time, $culture = null)
 
         $culture = null === $culture ? $this->culture : $culture;
 
-        $timeFormatInfo = @sfDateTimeFormatInfo::getInstance($culture);
+        $timeFormatInfo = @\sfDateTimeFormatInfo::getInstance($culture);
         $timeFormat = $timeFormatInfo->getShortTimePattern();
 
         // We construct the regexp based on time format
-        $timeRegexp = preg_replace(array('/[hm]+/i', '/a/'), array('(\d+)', '(\w+)'), preg_quote($timeFormat));
+        $timeRegexp = preg_replace(['/[hm]+/i', '/a/'], ['(\d+)', '(\w+)'], preg_quote($timeFormat));
 
         // We parse time format to see where things are (h, m)
-        $timePositions = array(
-            'h' => false !== strpos($timeFormat, 'H') ? strpos($timeFormat, 'H') : strpos($timeFormat, 'h'),
+        $timePositions = [
+            'h' =>   str_contains($timeFormat, 'H') ? strpos($timeFormat, 'H') : strpos($timeFormat, 'h'),
             'm' => strpos($timeFormat, 'm'),
             'a' => strpos($timeFormat, 'a'),
-        );
+        ];
         asort($timePositions);
         $i = 0;
 
@@ -364,7 +365,7 @@ public function getTimeForCulture($time, $culture = null)
             }
 
             // We get matching timestamp
-            return array($hour, $matches[$timePositions['m']]);
+            return [$hour, $matches[$timePositions['m']]];
         }
 
         return null;
@@ -387,9 +388,9 @@ public static function isMessageSourceFileBased($source)
     /**
      * Listens to the user.change_culture event.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
-    public function listenToChangeCultureEvent(sfEvent $event)
+    public function listenToChangeCultureEvent(\sfEvent $event)
     {
         // change the message format object with the new culture
         $this->setCulture($event['culture']);
@@ -398,9 +399,9 @@ public function listenToChangeCultureEvent(sfEvent $event)
     /**
      * Listens to the controller.change_action event.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
-    public function listenToChangeActionEvent(sfEvent $event)
+    public function listenToChangeActionEvent(\sfEvent $event)
     {
         // change message source directory to our module
         $this->setMessageSource($this->configuration->getI18NDirs($event['module']));
diff --git a/lib/i18n/sfIMessageSource.class.php b/lib/i18n/sfIMessageSource.class.php
index 8b2bc6316..54b09cd09 100644
--- a/lib/i18n/sfIMessageSource.class.php
+++ b/lib/i18n/sfIMessageSource.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfIMessageSource interface file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
diff --git a/lib/i18n/sfMessageFormat.class.php b/lib/i18n/sfMessageFormat.class.php
index 92cb42966..04b8b0a9e 100644
--- a/lib/i18n/sfMessageFormat.class.php
+++ b/lib/i18n/sfMessageFormat.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageFormat class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -53,7 +45,7 @@ class sfMessageFormat
     /**
      * The message source.
      *
-     * @var sfMessageSource
+     * @var \sfMessageSource
      */
     protected $source;
 
@@ -62,28 +54,28 @@ class sfMessageFormat
      *
      * @var array
      */
-    protected $catalogues = array();
+    protected $catalogues = [];
 
     /**
      * The translation messages.
      *
      * @var array
      */
-    protected $messages = array();
+    protected $messages = [];
 
     /**
      * A list of untranslated messages.
      *
      * @var array
      */
-    protected $untranslated = array();
+    protected $untranslated = [];
 
     /**
      * The prefix and suffix to append to untranslated messages.
      *
      * @var array
      */
-    protected $postscript = array('', '');
+    protected $postscript = ['', ''];
 
     /**
      * Output encoding charset.
@@ -97,10 +89,10 @@ class sfMessageFormat
      * Create a new instance of sfMessageFormat using the messages
      * from the supplied message source.
      *
-     * @param sfMessageSource $source  the source of translation messages
-     * @param string          $charset for the message output
+     * @param \sfMessageSource $source  the source of translation messages
+     * @param string           $charset for the message output
      */
-    public function __construct(sfIMessageSource $source, $charset = 'UTF-8')
+    public function __construct(\sfIMessageSource $source, $charset = 'UTF-8')
     {
         $this->source = $source;
         $this->setCharset($charset);
@@ -140,7 +132,7 @@ public function getCharset()
      *
      * @return string translated string
      */
-    public function format($string, $args = array(), $catalogue = null, $charset = null)
+    public function format($string, $args = [], $catalogue = null, $charset = null)
     {
         // make sure that objects with __toString() are converted to strings
         $string = (string) $string;
@@ -148,15 +140,15 @@ public function format($string, $args = array(), $catalogue = null, $charset = n
             $charset = $this->getCharset();
         }
 
-        $s = $this->formatString(sfToolkit::I18N_toUTF8($string, $charset), $args, $catalogue);
+        $s = $this->formatString(\sfToolkit::I18N_toUTF8($string, $charset), $args, $catalogue);
 
-        return sfToolkit::I18N_toEncoding($s, $charset);
+        return \sfToolkit::I18N_toEncoding($s, $charset);
     }
 
     /**
      * Gets the message source.
      *
-     * @return MessageSource
+     * @return \MessageSource
      */
     public function getSource()
     {
@@ -207,10 +199,10 @@ protected function loadCatalogue($catalogue)
      *
      * @return string translated string
      */
-    protected function formatString($string, $args = array(), $catalogue = null)
+    protected function formatString($string, $args = [], $catalogue = null)
     {
         if (empty($args)) {
-            $args = array();
+            $args = [];
         }
 
         if (empty($catalogue)) {
diff --git a/lib/i18n/sfMessageSource.class.php b/lib/i18n/sfMessageSource.class.php
index 8163bfc71..f2e5a6205 100644
--- a/lib/i18n/sfMessageSource.class.php
+++ b/lib/i18n/sfMessageSource.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -59,7 +51,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 19:55:49 EST 2004
  */
-abstract class sfMessageSource implements sfIMessageSource
+abstract class sfMessageSource implements \sfIMessageSource
 {
     /**
      * The culture name for this message source.
@@ -73,7 +65,7 @@ abstract class sfMessageSource implements sfIMessageSource
      *
      * @var array
      */
-    protected $messages = array();
+    protected $messages = [];
 
     /**
      * The source of message translations.
@@ -85,11 +77,11 @@ abstract class sfMessageSource implements sfIMessageSource
     /**
      * The translation cache.
      *
-     * @var sfMessageCache
+     * @var \sfMessageCache
      */
     protected $cache;
 
-    protected $untranslated = array();
+    protected $untranslated = [];
 
     /**
      * Private constructor. sfMessageSource must be initialized using
@@ -116,15 +108,15 @@ private function __construct()
      * @param string $source   the location of the resource
      * @param string $filename the filename of the custom message source
      *
-     * @return sfMessageSource a new message source of the specified type
+     * @return \sfMessageSource a new message source of the specified type
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public static function factory($type, $source = '.', $filename = '')
     {
         if ($filename) {
             if (!is_file($filename)) {
-                throw new sfException(sprintf('File %s not found.', $filename));
+                throw new \sfException(sprintf('File %s not found.', $filename));
             }
 
             include_once $filename;
@@ -136,7 +128,7 @@ public static function factory($type, $source = '.', $filename = '')
 
         $class = 'sfMessageSource_'.$type;
         if (!class_exists($class)) {
-            throw new sfException(sprintf('Unable to find type "%s".', $type));
+            throw new \sfException(sprintf('Unable to find type "%s".', $type));
         }
 
         return new $class($source);
@@ -165,7 +157,7 @@ public function load($catalogue = 'messages')
     {
         $variants = $this->getCatalogueList($catalogue);
 
-        $this->messages = array();
+        $this->messages = [];
 
         foreach ($variants as $variant) {
             $source = $this->getSource($variant);
@@ -219,7 +211,7 @@ public function read()
     /**
      * Gets the cache handler for this source.
      *
-     * @return sfMessageCache cache handler
+     * @return \sfMessageCache cache handler
      */
     public function getCache()
     {
@@ -229,9 +221,9 @@ public function getCache()
     /**
      * Sets the cache handler for caching the messages.
      *
-     * @param sfCache $cache the cache handler
+     * @param \sfCache $cache the cache handler
      */
-    public function setCache(sfCache $cache)
+    public function setCache(\sfCache $cache)
     {
         $this->cache = $cache;
     }
@@ -279,7 +271,7 @@ public function getCulture()
      */
     public function &loadData($variant)
     {
-        return array();
+        return [];
     }
 
     /**
@@ -316,7 +308,7 @@ public function isValidSource($source)
      */
     public function getCatalogueList($catalogue)
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/lib/i18n/sfMessageSource_Aggregate.class.php b/lib/i18n/sfMessageSource_Aggregate.class.php
index d0d336683..7098edd84 100644
--- a/lib/i18n/sfMessageSource_Aggregate.class.php
+++ b/lib/i18n/sfMessageSource_Aggregate.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfMessageSource_Aggregate extends sfMessageSource
+class sfMessageSource_Aggregate extends \sfMessageSource
 {
-    protected $messageSources = array();
+    protected $messageSources = [];
 
     /**
      * Constructor.
@@ -70,9 +71,9 @@ public function isValidSource($sources)
      */
     public function getSource($variant)
     {
-        $sources = array();
+        $sources = [];
         foreach ($this->messageSources as $messageSource) {
-            $sources[] = array($messageSource, $messageSource->getSource(str_replace($messageSource->getId(), '', $variant)));
+            $sources[] = [$messageSource, $messageSource->getSource(str_replace($messageSource->getId(), '', $variant))];
         }
 
         return $sources;
@@ -86,7 +87,7 @@ public function getSource($variant)
      */
     public function &loadData($sources)
     {
-        $messages = array();
+        $messages = [];
         foreach ($sources as $source) {
             if (false === $source[0]->isValidSource($source[1])) {
                 continue;
@@ -111,7 +112,7 @@ public function &loadData($sources)
      */
     public function getCatalogueList($catalogue)
     {
-        $variants = array();
+        $variants = [];
         foreach ($this->messageSources as $messageSource) {
             foreach ($messageSource->getCatalogueList($catalogue) as $variant) {
                 $variants[] = $messageSource->getId().$variant;
@@ -215,7 +216,7 @@ public function getId()
      */
     public function catalogues()
     {
-        throw new sfException('The "catalogues()" method is not implemented for this message source.');
+        throw new \sfException('The "catalogues()" method is not implemented for this message source.');
     }
 
     /**
diff --git a/lib/i18n/sfMessageSource_Database.class.php b/lib/i18n/sfMessageSource_Database.class.php
index 448f163b5..cb4a65b6c 100644
--- a/lib/i18n/sfMessageSource_Database.class.php
+++ b/lib/i18n/sfMessageSource_Database.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_Database class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -26,7 +18,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
  */
-abstract class sfMessageSource_Database extends sfMessageSource
+abstract class sfMessageSource_Database extends \sfMessageSource
 {
     /**
      * Gets all the variants of a particular catalogue.
@@ -39,7 +31,7 @@ public function getCatalogueList($catalogue)
     {
         $variants = explode('_', $this->culture);
 
-        $catalogues = array($catalogue);
+        $catalogues = [$catalogue];
 
         $variant = null;
 
@@ -73,7 +65,7 @@ protected function parseDSN($dsn)
             return $dsn;
         }
 
-        $parsed = array(
+        $parsed = [
             'phptype' => false,
             'dbsyntax' => false,
             'username' => false,
@@ -83,7 +75,7 @@ protected function parseDSN($dsn)
             'port' => false,
             'socket' => false,
             'database' => false,
-        );
+        ];
 
         // Find phptype and dbsyntax
         if (($pos = strpos($dsn, '://')) !== false) {
@@ -128,12 +120,12 @@ protected function parseDSN($dsn)
             $proto = $match[1];
             $proto_opts = (!empty($match[2])) ? $match[2] : false;
             $dsn = $match[3];
-        // $dsn => protocol+hostspec/database (old format)
+            // $dsn => protocol+hostspec/database (old format)
         } else {
-            if (false !== strpos($dsn, '+')) {
+            if (str_contains($dsn, '+')) {
                 list($proto, $dsn) = explode('+', $dsn, 2);
             }
-            if (false !== strpos($dsn, '/')) {
+            if (str_contains($dsn, '/')) {
                 list($proto_opts, $dsn) = explode('/', $dsn, 2);
             } else {
                 $proto_opts = $dsn;
@@ -145,7 +137,7 @@ protected function parseDSN($dsn)
         $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
         $proto_opts = rawurldecode($proto_opts);
         if ('tcp' == $parsed['protocol']) {
-            if (false !== strpos($proto_opts, ':')) {
+            if (str_contains($proto_opts, ':')) {
                 list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
             } else {
                 $parsed['hostspec'] = $proto_opts;
@@ -160,14 +152,14 @@ protected function parseDSN($dsn)
             // /database
             if (($pos = strpos($dsn, '?')) === false) {
                 $parsed['database'] = $dsn;
-            // /database?param1=value1&param2=value2
+                // /database?param1=value1&param2=value2
             } else {
                 $parsed['database'] = substr($dsn, 0, $pos);
                 $dsn = substr($dsn, $pos + 1);
-                if (false !== strpos($dsn, '&')) {
+                if (str_contains($dsn, '&')) {
                     $opts = explode('&', $dsn);
                 } else { // database?param1=value1
-                    $opts = array($dsn);
+                    $opts = [$dsn];
                 }
                 foreach ($opts as $opt) {
                     list($key, $value) = explode('=', $opt);
diff --git a/lib/i18n/sfMessageSource_File.class.php b/lib/i18n/sfMessageSource_File.class.php
index ad33dd3f9..32a056e0a 100644
--- a/lib/i18n/sfMessageSource_File.class.php
+++ b/lib/i18n/sfMessageSource_File.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_File class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -26,7 +18,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
  */
-abstract class sfMessageSource_File extends sfMessageSource
+abstract class sfMessageSource_File extends \sfMessageSource
 {
     /**
      * Separator between culture name and source.
@@ -96,7 +88,7 @@ public function getCatalogueList($catalogue)
         $variants = explode('_', $this->culture);
         $source = $catalogue.$this->dataExt;
 
-        $catalogues = array($source);
+        $catalogues = [$source];
 
         $variant = null;
 
@@ -143,7 +135,7 @@ public function getId()
     protected function getCatalogueByDir($catalogue)
     {
         $variants = explode('_', $this->culture);
-        $catalogues = array();
+        $catalogues = [];
 
         $variant = null;
 
@@ -162,8 +154,8 @@ protected function getCatalogueByDir($catalogue)
      * of directory structures.
      * E.g. array('messages', 'en_AU').
      *
-     * @param mixed|null $dir
-     * @param mixed|null $variant
+     * @param \mixed|null $dir
+     * @param \mixed|null $variant
      *
      * @return array list of catalogues
      */
@@ -172,7 +164,7 @@ protected function getCatalogues($dir = null, $variant = null)
         $dir = $dir ?: $this->getSource($variant);
         $files = scandir($dir);
 
-        $catalogue = array();
+        $catalogue = [];
 
         foreach ($files as $file) {
             if (is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
diff --git a/lib/i18n/sfMessageSource_MySQL.class.php b/lib/i18n/sfMessageSource_MySQL.class.php
index 8e18a0426..8023ee59a 100644
--- a/lib/i18n/sfMessageSource_MySQL.class.php
+++ b/lib/i18n/sfMessageSource_MySQL.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_MySQL class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -87,7 +79,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
  */
-class sfMessageSource_MySQL extends sfMessageSource_Database
+class sfMessageSource_MySQL extends \sfMessageSource_Database
 {
     /**
      * The datasource string, full DSN to the database.
@@ -106,7 +98,7 @@ class sfMessageSource_MySQL extends sfMessageSource_Database
     /**
      * A resource link to the database.
      *
-     * @var db
+     * @var \db
      */
     protected $db;
 
@@ -136,7 +128,7 @@ public function __destruct()
     /**
      * Gets the database connection.
      *
-     * @return db database connection
+     * @return \db database connection
      */
     public function connection()
     {
@@ -163,7 +155,7 @@ public function &loadData($variant)
 
         $rs = mysql_query($statement, $this->db);
 
-        $result = array();
+        $result = [];
 
         while ($row = mysql_fetch_array($rs, MYSQL_NUM)) {
             $source = $row[1];
@@ -318,7 +310,7 @@ public function catalogues()
     {
         $statement = 'SELECT name FROM catalogue ORDER BY name';
         $rs = mysql_query($statement, $this->db);
-        $result = array();
+        $result = [];
         while ($row = mysql_fetch_array($rs, MYSQL_NUM)) {
             $details = explode('.', $row[0]);
             if (!isset($details[1])) {
@@ -356,7 +348,7 @@ protected function connect()
         $connect_function = 'mysql_connect';
 
         if (!function_exists($connect_function)) {
-            throw new RuntimeException('The function mysql_connect() does not exist. Please confirm MySQL is enabled in php.ini');
+            throw new \RuntimeException('The function mysql_connect() does not exist. Please confirm MySQL is enabled in php.ini');
         }
 
         if ($dbhost && $user && $pw) {
@@ -370,15 +362,15 @@ protected function connect()
         }
 
         if (empty($conn)) {
-            throw new sfException(sprintf('Error in connecting to %s.', $dsninfo));
+            throw new \sfException(sprintf('Error in connecting to %s.', $dsninfo));
         }
 
         if ($dsninfo['database']) {
             if (!@mysql_select_db($dsninfo['database'], $conn)) {
-                throw new sfException(sprintf('Error in connecting database, dsn: %s.', $dsninfo));
+                throw new \sfException(sprintf('Error in connecting database, dsn: %s.', $dsninfo));
             }
         } else {
-            throw new sfException('Please provide a database for message translation.');
+            throw new \sfException('Please provide a database for message translation.');
         }
 
         return $conn;
@@ -431,7 +423,7 @@ protected function getCatalogueDetails($catalogue = 'messages')
 
         $count = (int) mysql_result($rs, 0);
 
-        return array($cat_id, $variant, $count);
+        return [$cat_id, $variant, $count];
     }
 
     /**
diff --git a/lib/i18n/sfMessageSource_SQLite.class.php b/lib/i18n/sfMessageSource_SQLite.class.php
index 58515889e..7662afcfc 100644
--- a/lib/i18n/sfMessageSource_SQLite.class.php
+++ b/lib/i18n/sfMessageSource_SQLite.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_SQLite class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -83,7 +75,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
  */
-class sfMessageSource_SQLite extends sfMessageSource_Database
+class sfMessageSource_SQLite extends \sfMessageSource_Database
 {
     /**
      * The SQLite datasource, the filename of the database.
@@ -127,7 +119,7 @@ public function &loadData($variant)
         $db = sqlite_open($this->source);
         $rs = sqlite_query($statement, $db);
 
-        $result = array();
+        $result = [];
 
         while ($row = sqlite_fetch_array($rs, SQLITE_NUM)) {
             $source = $row[1];
@@ -293,7 +285,7 @@ public function catalogues()
         $db = sqlite_open($this->source);
         $statement = 'SELECT name FROM catalogue ORDER BY name';
         $rs = sqlite_query($statement, $db);
-        $result = array();
+        $result = [];
         while ($row = sqlite_fetch_array($rs, SQLITE_NUM)) {
             $details = explode('.', $row[0]);
             if (!isset($details[1])) {
@@ -364,7 +356,7 @@ protected function getCatalogueDetails($catalogue = 'messages')
 
         sqlite_close($db);
 
-        return array($cat_id, $variant, $count);
+        return [$cat_id, $variant, $count];
     }
 
     /**
diff --git a/lib/i18n/sfMessageSource_SQLite3.class.php b/lib/i18n/sfMessageSource_SQLite3.class.php
index 6485ee7df..1546ef11b 100644
--- a/lib/i18n/sfMessageSource_SQLite3.class.php
+++ b/lib/i18n/sfMessageSource_SQLite3.class.php
@@ -1,21 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_SQLite class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @author     Jérôme Macias <jmacias@groupe-exp.com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -84,7 +75,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
  */
-class sfMessageSource_SQLite3 extends sfMessageSource_Database
+class sfMessageSource_SQLite3 extends \sfMessageSource_Database
 {
     /**
      * The SQLite datasource, the filename of the database.
@@ -116,7 +107,7 @@ public function __construct($source)
      */
     public function &loadData($variant)
     {
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
         $variant = $db->escapeString($variant);
 
@@ -127,10 +118,10 @@ public function &loadData($variant)
           AND c.name = '{$variant}'
         ORDER BY id ASC";
 
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
         $rs = $db->query($statement);
 
-        $result = array();
+        $result = [];
 
         while ($row = $rs->fetchArray(SQLITE3_NUM)) {
             $source = $row[1];
@@ -153,7 +144,7 @@ public function &loadData($variant)
      */
     public function isValidSource($variant)
     {
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
         $variant = $db->escapeString($variant);
         $rs = $db->querySingle("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'");
@@ -194,7 +185,7 @@ public function save($catalogue = 'messages')
         }
         $inserted = 0;
 
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
         $time = time();
 
         foreach ($messages as $message) {
@@ -232,7 +223,7 @@ public function update($text, $target, $comments, $catalogue = 'messages')
             return false;
         }
 
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
         $comments = $db->escapeString($comments);
         $target = $db->escapeString($target);
@@ -270,7 +261,7 @@ public function delete($message, $catalogue = 'messages')
             return false;
         }
 
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
         $text = $db->escapeString($message);
 
         $db->exec("DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'");
@@ -294,11 +285,11 @@ public function delete($message, $catalogue = 'messages')
      */
     public function catalogues()
     {
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
         $statement = 'SELECT name FROM catalogue ORDER BY name';
         $rs = $db->query($statement);
 
-        $result = array();
+        $result = [];
         while ($row = $rs->fetchArray(SQLITE3_NUM)) {
             $details = explode('.', $row[0]);
             if (!isset($details[1])) {
@@ -322,7 +313,7 @@ public function catalogues()
      */
     protected function getLastModified($source)
     {
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
         $source = $db->escapeString($source);
         $rs = $db->querySingle("SELECT date_modified FROM catalogue WHERE name = '{$source}'");
@@ -348,7 +339,7 @@ protected function getCatalogueDetails($catalogue = 'messages')
 
         $variant = $catalogue.'.'.$this->culture;
 
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
 
         $name = $db->escapeString($this->getSource($variant));
 
@@ -374,7 +365,7 @@ protected function getCatalogueDetails($catalogue = 'messages')
 
         $db->close();
 
-        return array($cat_id, $variant, $count);
+        return [$cat_id, $variant, $count];
     }
 
     /**
@@ -386,7 +377,7 @@ protected function updateCatalogueTime($cat_id, $variant)
     {
         $time = time();
 
-        $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+        $db = new \SQLite3($this->source, SQLITE3_OPEN_READWRITE);
         $result = $db->exec("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}");
         $res = (bool) $db->changes();
         $db->close();
diff --git a/lib/i18n/sfMessageSource_XLIFF.class.php b/lib/i18n/sfMessageSource_XLIFF.class.php
index 48e08a2ad..ffc27188a 100644
--- a/lib/i18n/sfMessageSource_XLIFF.class.php
+++ b/lib/i18n/sfMessageSource_XLIFF.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_XLIFF class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -32,7 +24,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
  */
-class sfMessageSource_XLIFF extends sfMessageSource_File
+class sfMessageSource_XLIFF extends \sfMessageSource_File
 {
     /**
      * Message data filename extension.
@@ -58,7 +50,7 @@ public function &loadData($filename)
 
         $translationUnit = $xml->xpath('//trans-unit');
 
-        $translations = array();
+        $translations = [];
 
         foreach ($translationUnit as $unit) {
             $source = (string) $unit->source;
@@ -94,7 +86,7 @@ public function save($catalogue = 'messages')
         }
 
         if (false == is_writable($filename)) {
-            throw new sfException(sprintf('Unable to save to file %s, file must be writable.', $filename));
+            throw new \sfException(sprintf('Unable to save to file %s, file must be writable.', $filename));
         }
 
         // create a new dom, import the existing xml
@@ -102,14 +94,14 @@ public function save($catalogue = 'messages')
         @$dom->load($filename);
 
         // find the body element
-        $xpath = new DOMXPath($dom);
+        $xpath = new \DOMXPath($dom);
         $body = $xpath->query('//body')->item(0);
 
         if (null === $body) {
             // create and try again
             $this->createMessageTemplate($catalogue);
             $dom->load($filename);
-            $xpath = new DOMXPath($dom);
+            $xpath = new \DOMXPath($dom);
             $body = $xpath->query('//body')->item(0);
         }
 
@@ -171,7 +163,7 @@ public function update($text, $target, $comments, $catalogue = 'messages')
         }
 
         if (false == is_writable($filename)) {
-            throw new sfException(sprintf('Unable to update file %s, file must be writable.', $filename));
+            throw new \sfException(sprintf('Unable to update file %s, file must be writable.', $filename));
         }
 
         // create a new dom, import the existing xml
@@ -179,7 +171,7 @@ public function update($text, $target, $comments, $catalogue = 'messages')
         $dom->load($filename);
 
         // find the body element
-        $xpath = new DOMXPath($dom);
+        $xpath = new \DOMXPath($dom);
         $units = $xpath->query('//trans-unit');
 
         // for each of the existin units
@@ -264,7 +256,7 @@ public function delete($message, $catalogue = 'messages')
         }
 
         if (false == is_writable($filename)) {
-            throw new sfException(sprintf('Unable to modify file %s, file must be writable.', $filename));
+            throw new \sfException(sprintf('Unable to modify file %s, file must be writable.', $filename));
         }
 
         // create a new dom, import the existing xml
@@ -272,7 +264,7 @@ public function delete($message, $catalogue = 'messages')
         $dom->load($filename);
 
         // find the body element
-        $xpath = new DOMXPath($dom);
+        $xpath = new \DOMXPath($dom);
         $units = $xpath->query('//trans-unit');
 
         // for each of the existin units
@@ -309,11 +301,11 @@ public function delete($message, $catalogue = 'messages')
      *
      * @param string $xml XML string
      *
-     * @return DOMDocument
+     * @return \DOMDocument
      */
     protected function createDOMDocument($xml = null)
     {
-        $domimp = new DOMImplementation();
+        $domimp = new \DOMImplementation();
         $doctype = $domimp->createDocumentType('xliff', '-//XLIFF//DTD XLIFF//EN', 'http://www.oasis-open.org/committees/xliff/documents/xliff.dtd');
         $dom = $domimp->createDocument('', '', $doctype);
         $dom->formatOutput = true;
@@ -351,7 +343,7 @@ protected function getVariants($catalogue = 'messages')
         foreach ($this->getCatalogueList($catalogue) as $variant) {
             $file = $this->getSource($variant);
             if (is_file($file)) {
-                return array($variant, $file);
+                return [$variant, $file];
             }
         }
 
@@ -374,14 +366,14 @@ protected function createMessageTemplate($catalogue)
         }
 
         if (!is_dir($dir)) {
-            throw new sfException(sprintf('Unable to create directory %s.', $dir));
+            throw new \sfException(sprintf('Unable to create directory %s.', $dir));
         }
 
         $dom = $this->createDOMDocument($this->getTemplate($catalogue));
         file_put_contents($file, $dom->saveXML());
         chmod($file, 0777);
 
-        return array($variant, $file);
+        return [$variant, $file];
     }
 
     protected function getTemplate($catalogue)
diff --git a/lib/i18n/sfMessageSource_gettext.class.php b/lib/i18n/sfMessageSource_gettext.class.php
index 454ecf5d1..06f135be5 100644
--- a/lib/i18n/sfMessageSource_gettext.class.php
+++ b/lib/i18n/sfMessageSource_gettext.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfMessageSource_gettext class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -29,7 +21,7 @@
  *
  * @version v1.0, last update on Fri Dec 24 16:18:44 EST 2004
  */
-class sfMessageSource_gettext extends sfMessageSource_File
+class sfMessageSource_gettext extends \sfMessageSource_File
 {
     /**
      * Message data filename extension.
@@ -54,11 +46,11 @@ class sfMessageSource_gettext extends sfMessageSource_File
      */
     public function &loadData($filename)
     {
-        $mo = TGettext::factory('MO', $filename);
+        $mo = \TGettext::factory('MO', $filename);
         $mo->load();
         $result = $mo->toArray();
 
-        $results = array();
+        $results = [];
         $count = 0;
         foreach ($result['strings'] as $source => $target) {
             $results[$source][] = $target;  // target
@@ -95,20 +87,20 @@ public function save($catalogue = 'messages')
         }
 
         if (false == is_writable($MOFile)) {
-            throw new sfException(sprintf('Unable to save to file %s, file must be writable.', $MOFile));
+            throw new \sfException(sprintf('Unable to save to file %s, file must be writable.', $MOFile));
         }
         if (false == is_writable($POFile)) {
-            throw new sfException(sprintf('Unable to save to file %s, file must be writable.', $POFile));
+            throw new \sfException(sprintf('Unable to save to file %s, file must be writable.', $POFile));
         }
 
         // set the strings as untranslated.
-        $strings = array();
+        $strings = [];
         foreach ($messages as $message) {
             $strings[$message] = '';
         }
 
         // load the PO
-        $po = TGettext::factory('PO', $POFile);
+        $po = \TGettext::factory('PO', $POFile);
         $po->load();
         $result = $po->toArray();
 
@@ -157,14 +149,14 @@ public function delete($message, $catalogue = 'messages')
         }
 
         if (false == is_writable($MOFile)) {
-            throw new sfException(sprintf('Unable to modify file %s, file must be writable.', $MOFile));
+            throw new \sfException(sprintf('Unable to modify file %s, file must be writable.', $MOFile));
         }
 
         if (false == is_writable($POFile)) {
-            throw new sfException(sprintf('Unable to modify file %s, file must be writable.', $POFile));
+            throw new \sfException(sprintf('Unable to modify file %s, file must be writable.', $POFile));
         }
 
-        $po = TGettext::factory('PO', $POFile);
+        $po = \TGettext::factory('PO', $POFile);
         $po->load();
         $result = $po->toArray();
 
@@ -210,14 +202,14 @@ public function update($text, $target, $comments, $catalogue = 'messages')
         }
 
         if (false == is_writable($MOFile)) {
-            throw new sfException(sprintf('Unable to update file %s, file must be writable.', $MOFile));
+            throw new \sfException(sprintf('Unable to update file %s, file must be writable.', $MOFile));
         }
 
         if (false == is_writable($POFile)) {
-            throw new sfException(sprintf('Unable to update file %s, file must be writable.', $POFile));
+            throw new \sfException(sprintf('Unable to update file %s, file must be writable.', $POFile));
         }
 
-        $po = TGettext::factory('PO', $POFile);
+        $po = \TGettext::factory('PO', $POFile);
         $po->load();
         $result = $po->toArray();
 
@@ -265,7 +257,7 @@ protected function getVariants($catalogue = 'messages')
             $file = $this->getSource($variant);
             $po = $this->getPOFile($file);
             if (is_file($file) || is_file($po)) {
-                return array($variant, $file, $po);
+                return [$variant, $file, $po];
             }
         }
 
@@ -295,19 +287,19 @@ protected function createMessageTemplate($catalogue)
         }
 
         if (!is_dir($dir)) {
-            throw new sfException(sprintf('Unable to create directory %s.', $dir));
+            throw new \sfException(sprintf('Unable to create directory %s.', $dir));
         }
 
-        $po = TGettext::factory('PO', $po_file);
+        $po = \TGettext::factory('PO', $po_file);
         $result['meta']['PO-Revision-Date'] = date('Y-m-d H:i:s');
-        $result['strings'] = array();
+        $result['strings'] = [];
 
         $po->fromArray($result);
         $mo = $po->toMO();
         if ($po->save() && $mo->save($mo_file)) {
-            return array($variant, $mo_file, $po_file);
+            return [$variant, $mo_file, $po_file];
         }
 
-        throw new sfException(sprintf('Unable to create file %s and %s.', $po_file, $mo_file));
+        throw new \sfException(sprintf('Unable to create file %s and %s.', $po_file, $mo_file));
     }
 }
diff --git a/lib/i18n/sfNumberFormat.class.php b/lib/i18n/sfNumberFormat.class.php
index 84a2fdcf3..37b575a73 100644
--- a/lib/i18n/sfNumberFormat.class.php
+++ b/lib/i18n/sfNumberFormat.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfNumberFormat class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -64,7 +56,7 @@ class sfNumberFormat
     /**
      * The DateTimeFormatInfo, containing culture specific patterns and names.
      *
-     * @var DateTimeFormatInfo
+     * @var \DateTimeFormatInfo
      */
     protected $formatInfo;
 
@@ -76,18 +68,18 @@ class sfNumberFormat
      *
      * @param mixed $formatInfo either null, a sfCultureInfo, a sfNumberFormatInfo, or string
      *
-     * @return sfNumberFormat
+     * @return \sfNumberFormat
      */
     public function __construct($formatInfo = null)
     {
         if (null === $formatInfo) {
-            $this->formatInfo = sfNumberFormatInfo::getInvariantInfo();
-        } elseif ($formatInfo instanceof sfCultureInfo) {
+            $this->formatInfo = \sfNumberFormatInfo::getInvariantInfo();
+        } elseif ($formatInfo instanceof \sfCultureInfo) {
             $this->formatInfo = $formatInfo->getNumberFormat();
-        } elseif ($formatInfo instanceof sfNumberFormatInfo) {
+        } elseif ($formatInfo instanceof \sfNumberFormatInfo) {
             $this->formatInfo = $formatInfo;
         } else {
-            $this->formatInfo = sfNumberFormatInfo::getInstance($formatInfo);
+            $this->formatInfo = \sfNumberFormatInfo::getInstance($formatInfo);
         }
     }
 
@@ -143,7 +135,7 @@ public function format($number, $pattern = 'd', $currency = 'USD', $charset = 'U
 
         $result = str_replace('¤', $symbol ?: '', $result);
 
-        return sfToolkit::I18N_toEncoding($result, $charset);
+        return \sfToolkit::I18N_toEncoding($result, $charset);
     }
 
     /**
@@ -263,25 +255,25 @@ protected function setPattern($pattern)
         switch ($pattern) {
             case 'c':
             case 'C':
-                $this->formatInfo->setPattern(sfNumberFormatInfo::CURRENCY);
+                $this->formatInfo->setPattern(\sfNumberFormatInfo::CURRENCY);
 
                 break;
 
             case 'd':
             case 'D':
-                $this->formatInfo->setPattern(sfNumberFormatInfo::DECIMAL);
+                $this->formatInfo->setPattern(\sfNumberFormatInfo::DECIMAL);
 
                 break;
 
             case 'e':
             case 'E':
-                $this->formatInfo->setPattern(sfNumberFormatInfo::SCIENTIFIC);
+                $this->formatInfo->setPattern(\sfNumberFormatInfo::SCIENTIFIC);
 
                 break;
 
             case 'p':
             case 'P':
-                $this->formatInfo->setPattern(sfNumberFormatInfo::PERCENTAGE);
+                $this->formatInfo->setPattern(\sfNumberFormatInfo::PERCENTAGE);
 
                 break;
 
@@ -296,7 +288,7 @@ protected function fixFloat($float)
     {
         $string = (string) $float;
 
-        if (false === strpos($float, 'E')) {
+        if (!str_contains($float, 'E')) {
             return $string;
         }
 
diff --git a/lib/i18n/sfNumberFormatInfo.class.php b/lib/i18n/sfNumberFormatInfo.class.php
index e047be56f..3ef403839 100644
--- a/lib/i18n/sfNumberFormatInfo.class.php
+++ b/lib/i18n/sfNumberFormatInfo.class.php
@@ -1,20 +1,12 @@
 <?php
 
-/**
- * sfNumberFormatInfo class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
@@ -51,21 +43,21 @@ class sfNumberFormatInfo
      *
      * @var array
      */
-    protected $data = array();
+    protected $data = [];
 
     /**
      * A list of properties that are accessable/writable.
      *
      * @var array
      */
-    protected $properties = array();
+    protected $properties = [];
 
     /**
      * The number pattern.
      *
      * @var array
      */
-    protected $pattern = array();
+    protected $pattern = [];
 
     /**
      * Initializes a new writable instance of the sfNumberFormatInfo class
@@ -79,12 +71,12 @@ class sfNumberFormatInfo
      *
      * @see getInstance()
      */
-    public function __construct($data = array(), $type = sfNumberFormatInfo::DECIMAL)
+    public function __construct($data = [], $type = \sfNumberFormatInfo::DECIMAL)
     {
         $this->properties = get_class_methods($this);
 
         if (empty($data)) {
-            throw new sfException('Please provide the ICU data to initialize.');
+            throw new \sfException('Please provide the ICU data to initialize.');
         }
 
         $this->data = $data;
@@ -103,7 +95,7 @@ public function __get($name)
             return $this->{$getProperty}();
         }
 
-        throw new sfException(sprintf('Property %s does not exists.', $name));
+        throw new \sfException(sprintf('Property %s does not exists.', $name));
     }
 
     /**
@@ -116,7 +108,7 @@ public function __set($name, $value)
         if (in_array($setProperty, $this->properties)) {
             $this->{$setProperty}($value);
         } else {
-            throw new sfException(sprintf('Property %s can not be set.', $name));
+            throw new \sfException(sprintf('Property %s can not be set.', $name));
         }
     }
 
@@ -127,7 +119,7 @@ public function __set($name, $value)
      *
      * @param int $type pattern type
      */
-    public function setPattern($type = sfNumberFormatInfo::DECIMAL)
+    public function setPattern($type = \sfNumberFormatInfo::DECIMAL)
     {
         if (is_int($type)) {
             $this->pattern = $this->parsePattern($this->data['NumberPatterns'][$type]);
@@ -148,13 +140,13 @@ public function getPattern()
     /**
      * Gets the default sfNumberFormatInfo that is culture-independent (invariant).
      *
-     * @return sfNumberFormatInfo default sfNumberFormatInfo
+     * @return \sfNumberFormatInfo default sfNumberFormatInfo
      */
-    public static function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL)
+    public static function getInvariantInfo($type = \sfNumberFormatInfo::DECIMAL)
     {
         static $invariant;
         if (null === $invariant) {
-            $culture = sfCultureInfo::getInvariantCulture();
+            $culture = \sfCultureInfo::getInvariantCulture();
             $invariant = $culture->NumberFormat;
             $invariant->setPattern($type);
         }
@@ -165,34 +157,34 @@ public static function getInvariantInfo($type = sfNumberFormatInfo::DECIMAL)
     /**
      * Returns the sfNumberFormatInfo associated with the specified culture.
      *
-     * @param sfCultureInfo $culture the culture that gets the sfNumberFormat property
-     * @param int           $type    the number formatting type, it should be
-     *                               sfNumberFormatInfo::DECIMAL, sfNumberFormatInfo::CURRENCY,
-     *                               sfNumberFormatInfo::PERCENTAGE, or sfNumberFormatInfo::SCIENTIFIC
+     * @param \sfCultureInfo $culture the culture that gets the sfNumberFormat property
+     * @param int            $type    the number formatting type, it should be
+     *                                sfNumberFormatInfo::DECIMAL, sfNumberFormatInfo::CURRENCY,
+     *                                sfNumberFormatInfo::PERCENTAGE, or sfNumberFormatInfo::SCIENTIFIC
      *
-     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     * @return \sfNumberFormatInfo sfNumberFormatInfo for the specified culture
      *
      * @see getCurrencyInstance();
      * @see getPercentageInstance();
      * @see getScientificInstance();
      */
-    public static function getInstance($culture = null, $type = sfNumberFormatInfo::DECIMAL)
+    public static function getInstance($culture = null, $type = \sfNumberFormatInfo::DECIMAL)
     {
-        if ($culture instanceof sfCultureInfo) {
+        if ($culture instanceof \sfCultureInfo) {
             $formatInfo = $culture->getNumberFormat();
             $formatInfo->setPattern($type);
 
             return $formatInfo;
         }
         if (is_string($culture)) {
-            $sfCultureInfo = sfCultureInfo::getInstance($culture);
+            $sfCultureInfo = \sfCultureInfo::getInstance($culture);
             $formatInfo = $sfCultureInfo->getNumberFormat();
             $formatInfo->setPattern($type);
 
             return $formatInfo;
         }
 
-        $sfCultureInfo = sfCultureInfo::getInstance();
+        $sfCultureInfo = \sfCultureInfo::getInstance();
         $formatInfo = $sfCultureInfo->getNumberFormat();
         $formatInfo->setPattern($type);
 
@@ -202,9 +194,9 @@ public static function getInstance($culture = null, $type = sfNumberFormatInfo::
     /**
      * Returns the currency format info associated with the specified culture.
      *
-     * @param sfCultureInfo $culture the culture that gets the NumberFormat property
+     * @param \sfCultureInfo $culture the culture that gets the NumberFormat property
      *
-     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     * @return \sfNumberFormatInfo sfNumberFormatInfo for the specified culture
      */
     public static function getCurrencyInstance($culture = null)
     {
@@ -214,9 +206,9 @@ public static function getCurrencyInstance($culture = null)
     /**
      * Returns the percentage format info associated with the specified culture.
      *
-     * @param sfCultureInfo $culture the culture that gets the NumberFormat property
+     * @param \sfCultureInfo $culture the culture that gets the NumberFormat property
      *
-     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     * @return \sfNumberFormatInfo sfNumberFormatInfo for the specified culture
      */
     public static function getPercentageInstance($culture = null)
     {
@@ -226,9 +218,9 @@ public static function getPercentageInstance($culture = null)
     /**
      * Returns the scientific format info associated with the specified culture.
      *
-     * @param sfCultureInfo $culture the culture that gets the NumberFormat property
+     * @param \sfCultureInfo $culture the culture that gets the NumberFormat property
      *
-     * @return sfNumberFormatInfo sfNumberFormatInfo for the specified culture
+     * @return \sfNumberFormatInfo sfNumberFormatInfo for the specified culture
      */
     public static function getScientificInstance($culture = null)
     {
@@ -329,7 +321,7 @@ public function getGroupSizes()
         $group1 = $this->pattern['groupSize1'];
         $group2 = $this->pattern['groupSize2'];
 
-        return array($group1, $group2);
+        return [$group1, $group2];
     }
 
     /**
@@ -351,14 +343,14 @@ public function setGroupSizes($groupSize)
      * The negative pattern is composed of a prefix, and postfix.
      * This function returns <b>array(prefix, postfix)</b>.
      *
-     * @return arary negative pattern
+     * @return \arary negative pattern
      */
     public function getNegativePattern()
     {
         $prefix = $this->pattern['negPref'];
         $postfix = $this->pattern['negPost'];
 
-        return array($prefix, $postfix);
+        return [$prefix, $postfix];
     }
 
     /**
@@ -366,7 +358,7 @@ public function getNegativePattern()
      * The negative pattern is composed of a prefix, and postfix in the form
      * <b>array(prefix, postfix)</b>.
      *
-     * @param arary $pattern negative pattern
+     * @param \arary $pattern negative pattern
      */
     public function setNegativePattern($pattern)
     {
@@ -379,14 +371,14 @@ public function setNegativePattern($pattern)
      * The positive pattern is composed of a prefix, and postfix.
      * This function returns <b>array(prefix, postfix)</b>.
      *
-     * @return arary positive pattern
+     * @return \arary positive pattern
      */
     public function getPositivePattern()
     {
         $prefix = $this->pattern['posPref'];
         $postfix = $this->pattern['posPost'];
 
-        return array($prefix, $postfix);
+        return [$prefix, $postfix];
     }
 
     /**
@@ -394,7 +386,7 @@ public function getPositivePattern()
      * The positive pattern is composed of a prefix, and postfix in the form
      * <b>array(prefix, postfix)</b>.
      *
-     * @param arary $pattern positive pattern
+     * @param \arary $pattern positive pattern
      */
     public function setPositivePattern($pattern)
     {
@@ -681,6 +673,6 @@ protected function getPrePostfix($pattern)
         $regexp = '/[#,\.0]+/';
         $result = preg_split($regexp, $pattern);
 
-        return array($result[0], $result[1]);
+        return [$result[0], $result[1]];
     }
 }
diff --git a/lib/log/sfAggregateLogger.class.php b/lib/log/sfAggregateLogger.class.php
index 5e2799c57..9321dfddd 100644
--- a/lib/log/sfAggregateLogger.class.php
+++ b/lib/log/sfAggregateLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfAggregateLogger extends sfLogger
+class sfAggregateLogger extends \sfLogger
 {
-    protected $loggers = array();
+    protected $loggers = [];
 
     /**
      * Initializes this logger.
@@ -26,16 +27,16 @@ class sfAggregateLogger extends sfLogger
      *
      * - loggers: Logger objects that extends sfLogger.
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->dispatcher = $dispatcher;
 
         if (isset($options['loggers'])) {
             if (!is_array($options['loggers'])) {
-                $options['loggers'] = array($options['loggers']);
+                $options['loggers'] = [$options['loggers']];
             }
 
             $this->addLoggers($options['loggers']);
@@ -69,13 +70,13 @@ public function addLoggers($loggers)
     /**
      * Adds a logger.
      *
-     * @param sfLoggerInterface $logger The Logger object
+     * @param \sfLoggerInterface $logger The Logger object
      */
-    public function addLogger(sfLoggerInterface $logger)
+    public function addLogger(\sfLoggerInterface $logger)
     {
         $this->loggers[] = $logger;
 
-        $this->dispatcher->disconnect('application.log', array($logger, 'listenToLogEvent'));
+        $this->dispatcher->disconnect('application.log', [$logger, 'listenToLogEvent']);
     }
 
     /**
@@ -84,12 +85,12 @@ public function addLogger(sfLoggerInterface $logger)
     public function shutdown()
     {
         foreach ($this->loggers as $logger) {
-            if ($logger instanceof sfLogger) {
+            if ($logger instanceof \sfLogger) {
                 $logger->shutdown();
             }
         }
 
-        $this->loggers = array();
+        $this->loggers = [];
     }
 
     /**
diff --git a/lib/log/sfConsoleLogger.class.php b/lib/log/sfConsoleLogger.class.php
index c7fecd682..823504e60 100644
--- a/lib/log/sfConsoleLogger.class.php
+++ b/lib/log/sfConsoleLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,15 +16,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfConsoleLogger extends sfStreamLogger
+class sfConsoleLogger extends \sfStreamLogger
 {
     /**
-     * @see sfStreamLogger
+     * @see \sfStreamLogger
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $options['stream'] = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w');
 
diff --git a/lib/log/sfEventLogger.class.php b/lib/log/sfEventLogger.class.php
index dc90a06e8..71178dc3a 100644
--- a/lib/log/sfEventLogger.class.php
+++ b/lib/log/sfEventLogger.class.php
@@ -1,14 +1,23 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * sfEventLogger sends log messages to the event dispatcher to be processed
  * by registered loggers.
  *
  * @author     Jérôme Tamarelle <jtamarelle@groupe-exp.com>
  */
-class sfEventLogger extends sfLogger
+class sfEventLogger extends \sfLogger
 {
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->dispatcher = $dispatcher;
         $this->options = $options;
@@ -25,6 +34,6 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
 
     protected function doLog($message, $priority)
     {
-        $this->dispatcher->notify(new sfEvent($this, $this->options['event_name'], array($message, 'priority' => $priority)));
+        $this->dispatcher->notify(new \sfEvent($this, $this->options['event_name'], [$message, 'priority' => $priority]));
     }
 }
diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php
index 1c6c357e3..d86d071e5 100644
--- a/lib/log/sfFileLogger.class.php
+++ b/lib/log/sfFileLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfFileLogger extends sfLogger
+class sfFileLogger extends \sfLogger
 {
     protected $type = 'symfony';
     protected $format = '%time% %type% [%priority%] %message%%EOL%';
@@ -34,16 +35,16 @@ class sfFileLogger extends sfLogger
      * - dir_mode:    The mode to use when creating a directory (default to 0777)
      * - file_mode:   The mode to use when creating a file (default to 0666)
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      *
-     * @throws sfConfigurationException
-     * @throws sfFileException
+     * @throws \sfConfigurationException
+     * @throws \sfFileException
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         if (!isset($options['file'])) {
-            throw new sfConfigurationException('You must provide a "file" parameter for this logger.');
+            throw new \sfConfigurationException('You must provide a "file" parameter for this logger.');
         }
 
         if (isset($options['format'])) {
@@ -66,7 +67,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
 
         $fileExists = file_exists($options['file']);
         if (!is_writable($dir) || ($fileExists && !is_writable($options['file']))) {
-            throw new sfFileException(sprintf('Unable to open the log file "%s" for writing.', $options['file']));
+            throw new \sfFileException(sprintf('Unable to open the log file "%s" for writing.', $options['file']));
         }
 
         $this->fp = fopen($options['file'], 'a');
@@ -108,13 +109,13 @@ public static function strftime($format)
     protected function doLog($message, $priority)
     {
         flock($this->fp, LOCK_EX);
-        fwrite($this->fp, strtr($this->format, array(
+        fwrite($this->fp, strtr($this->format, [
             '%type%' => $this->type,
             '%message%' => $message,
             '%time%' => self::strftime($this->timeFormat),
             '%priority%' => $this->getPriority($priority),
             '%EOL%' => PHP_EOL,
-        )));
+        ]));
         flock($this->fp, LOCK_UN);
     }
 
@@ -127,7 +128,7 @@ protected function doLog($message, $priority)
      */
     protected function getPriority($priority)
     {
-        return sfLogger::getPriorityName($priority);
+        return \sfLogger::getPriorityName($priority);
     }
 
     /**
@@ -151,7 +152,7 @@ protected function getPriority($priority)
     private static function _strftimeFormatToDateFormat($strftimeFormat)
     {
         // Missing %V %C %g %G
-        $search = array(
+        $search = [
             '%a', '%A', '%d', '%e', '%u',
             '%w', '%W', '%b', '%h', '%B',
             '%m', '%y', '%Y', '%D', '%F',
@@ -159,9 +160,9 @@ private static function _strftimeFormatToDateFormat($strftimeFormat)
             '%I', '%l', '%M', '%p', '%P',
             '%r' /* %I:%M:%S %p */, '%R' /* %H:%M */, '%S', '%T' /* %H:%M:%S */, '%X', '%z', '%Z',
             '%c', '%s', '%j',
-            '%%');
+            '%%'];
 
-        $replace = array(
+        $replace = [
             'D', 'l', 'd', 'j', 'N',
             'w', 'W', 'M', 'M', 'F',
             'm', 'y', 'Y', 'm/d/y', 'Y-m-d',
@@ -169,7 +170,7 @@ private static function _strftimeFormatToDateFormat($strftimeFormat)
             'h', 'g', 'i', 'A', 'a',
             'h:i:s A', 'H:i', 's', 'H:i:s', 'H:i:s', 'O', 'T',
             'D M j H:i:s Y' /* Tue Feb 5 00:45:10 2009 */, 'U', 'z',
-            '%');
+            '%'];
 
         return str_replace($search, $replace, $strftimeFormat);
     }
diff --git a/lib/log/sfLogger.class.php b/lib/log/sfLogger.class.php
index e6fea4c25..4785683f7 100644
--- a/lib/log/sfLogger.class.php
+++ b/lib/log/sfLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,7 +26,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfLogger implements sfLoggerInterface
+abstract class sfLogger implements \sfLoggerInterface
 {
     public const EMERG = 0; // System is unusable
     public const ALERT = 1; // Immediate action required
@@ -36,11 +37,11 @@ abstract class sfLogger implements sfLoggerInterface
     public const INFO = 6; // Informational
     public const DEBUG = 7; // Debug-level messages
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
     /** @var array */
-    protected $options = array();
+    protected $options = [];
 
     /** @var int */
     protected $level = self::INFO;
@@ -50,15 +51,15 @@ abstract class sfLogger implements sfLoggerInterface
      *
      * @see initialize()
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      */
-    public function __construct(sfEventDispatcher $dispatcher, $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->initialize($dispatcher, $options);
 
         if (!isset($options['auto_shutdown']) || $options['auto_shutdown']) {
-            register_shutdown_function(array($this, 'shutdown'));
+            register_shutdown_function([$this, 'shutdown']);
         }
     }
 
@@ -69,12 +70,12 @@ public function __construct(sfEventDispatcher $dispatcher, $options = array())
      *
      * - level: The log level.
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfLogger
+     * @throws \sfInitializationException If an error occurs while initializing this sfLogger
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->dispatcher = $dispatcher;
         $this->options = $options;
@@ -83,7 +84,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
             $this->setLogLevel($this->options['level']);
         }
 
-        $dispatcher->connect('application.log', array($this, 'listenToLogEvent'));
+        $dispatcher->connect('application.log', [$this, 'listenToLogEvent']);
     }
 
     /**
@@ -230,9 +231,9 @@ public function debug($message)
     /**
      * Listens to application.log events.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
-    public function listenToLogEvent(sfEvent $event)
+    public function listenToLogEvent(\sfEvent $event)
     {
         $priority = isset($event['priority']) ? $event['priority'] : self::INFO;
 
@@ -263,11 +264,11 @@ public function shutdown()
      *
      * @return string The priority name
      *
-     * @throws sfException if the priority level does not exist
+     * @throws \sfException if the priority level does not exist
      */
     public static function getPriorityName($priority)
     {
-        static $levels = array(
+        static $levels = [
             self::EMERG => 'emerg',
             self::ALERT => 'alert',
             self::CRIT => 'crit',
@@ -276,10 +277,10 @@ public static function getPriorityName($priority)
             self::NOTICE => 'notice',
             self::INFO => 'info',
             self::DEBUG => 'debug',
-        );
+        ];
 
         if (!isset($levels[$priority])) {
-            throw new sfException(sprintf('The priority level "%s" does not exist.', $priority));
+            throw new \sfException(sprintf('The priority level "%s" does not exist.', $priority));
         }
 
         return $levels[$priority];
diff --git a/lib/log/sfLoggerInterface.class.php b/lib/log/sfLoggerInterface.class.php
index b59c3eeac..7ec810f41 100644
--- a/lib/log/sfLoggerInterface.class.php
+++ b/lib/log/sfLoggerInterface.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/log/sfLoggerWrapper.class.php b/lib/log/sfLoggerWrapper.class.php
index 509e85126..1aa1313d3 100644
--- a/lib/log/sfLoggerWrapper.class.php
+++ b/lib/log/sfLoggerWrapper.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfLoggerWrapper extends sfLogger
+class sfLoggerWrapper extends \sfLogger
 {
-    /** @var sfLoggerInterface */
+    /** @var \sfLoggerInterface */
     protected $logger;
 
     /**
      * Creates a new logger wrapper.
      *
-     * @param sfLoggerInterface $logger The wrapped logger
+     * @param \sfLoggerInterface $logger The wrapped logger
      */
-    public function __construct(sfLoggerInterface $logger)
+    public function __construct(\sfLoggerInterface $logger)
     {
         $this->logger = $logger;
     }
diff --git a/lib/log/sfNoLogger.class.php b/lib/log/sfNoLogger.class.php
index e307cdf9d..43db67c67 100644
--- a/lib/log/sfNoLogger.class.php
+++ b/lib/log/sfNoLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,15 +16,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfNoLogger extends sfLogger
+class sfNoLogger extends \sfLogger
 {
     /**
      * Initializes this logger.
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
     }
 
diff --git a/lib/log/sfPsrLoggerAdapter.class.php b/lib/log/sfPsrLoggerAdapter.class.php
index 1afeba7f8..171725fff 100644
--- a/lib/log/sfPsrLoggerAdapter.class.php
+++ b/lib/log/sfPsrLoggerAdapter.class.php
@@ -1,4 +1,16 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Psr\Log\LoggerInterface;
+
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
@@ -14,19 +26,19 @@
  *
  * @author     Martin Poirier Theoret <mpoiriert@gmail.com>
  */
-class sfPsrLoggerAdapter extends sfLogger
+class sfPsrLoggerAdapter extends \sfLogger
 {
     /**
      * Buffer to keep all the log before the psr logger is registered.
      *
      * @var array
      */
-    private $buffer = array();
+    private $buffer = [];
 
     /**
      * The logger that will the log will be forward to.
      *
-     * @var Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -47,14 +59,14 @@ class sfPsrLoggerAdapter extends sfLogger
      *
      * @param array $options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         if (isset($options['logger_service_id'])) {
             $this->loggerServiceId = $options['logger_service_id'];
         }
 
         if (!isset($options['auto_connect']) || $options['auto_connect']) {
-            $dispatcher->connect('context.load_factories', array($this, 'listenContextLoadFactoriesEvent'));
+            $dispatcher->connect('context.load_factories', [$this, 'listenContextLoadFactoriesEvent']);
         }
 
         parent::initialize($dispatcher, $options);
@@ -63,18 +75,18 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
     /**
      * Listen the context load factories to get the configure service after the service container is available.
      */
-    public function listenContextLoadFactoriesEvent(sfEvent $event)
+    public function listenContextLoadFactoriesEvent(\sfEvent $event)
     {
         $context = $event->getSubject();
         // @var $context sfContext
         $this->setLogger($context->getService($this->loggerServiceId));
-        $this->dispatcher->disconnect('context.load_factories', array($this, 'listenContextLoadFactoriesEvent'));
+        $this->dispatcher->disconnect('context.load_factories', [$this, 'listenContextLoadFactoriesEvent']);
     }
 
     /**
      * Set the logger.
      */
-    public function setLogger(Psr\Log\LoggerInterface $logger)
+    public function setLogger(LoggerInterface $logger)
     {
         $this->logger = $logger;
         $this->flushBuffer();
@@ -86,7 +98,7 @@ public function setLogger(Psr\Log\LoggerInterface $logger)
     public function flushBuffer()
     {
         if (!$this->logger) {
-            $this->buffer = array();
+            $this->buffer = [];
 
             return;
         }
@@ -95,7 +107,7 @@ public function flushBuffer()
             $this->log($log['message'], $log['priority']);
         }
 
-        $this->buffer = array();
+        $this->buffer = [];
     }
 
     /**
@@ -113,42 +125,42 @@ public function doLog($message, $priority)
         }
 
         switch ($priority) {
-            case sfLogger::EMERG:
+            case \sfLogger::EMERG:
                 $this->logger->emergency($message);
 
                 break;
 
-            case sfLogger::ALERT:
+            case \sfLogger::ALERT:
                 $this->logger->alert($message);
 
                 break;
 
-            case sfLogger::CRIT:
+            case \sfLogger::CRIT:
                 $this->logger->critical($message);
 
                 break;
 
-            case sfLogger::ERR:
+            case \sfLogger::ERR:
                 $this->logger->error($message);
 
                 break;
 
-            case sfLogger::WARNING:
+            case \sfLogger::WARNING:
                 $this->logger->warning($message);
 
                 break;
 
-            case sfLogger::NOTICE:
+            case \sfLogger::NOTICE:
                 $this->logger->notice($message);
 
                 break;
 
-            case sfLogger::INFO:
+            case \sfLogger::INFO:
                 $this->logger->info($message);
 
                 break;
 
-            case sfLogger::DEBUG:
+            case \sfLogger::DEBUG:
                 $this->logger->debug($message);
 
                 break;
diff --git a/lib/log/sfStreamLogger.class.php b/lib/log/sfStreamLogger.class.php
index 570609a8e..c8e219059 100644
--- a/lib/log/sfStreamLogger.class.php
+++ b/lib/log/sfStreamLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfStreamLogger extends sfLogger
+class sfStreamLogger extends \sfLogger
 {
     /** @var resource */
     protected $stream;
@@ -27,19 +28,19 @@ class sfStreamLogger extends sfLogger
      *
      * - stream: A PHP stream
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      *
-     * @throws sfConfigurationException
+     * @throws \sfConfigurationException
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         if (!isset($options['stream'])) {
-            throw new sfConfigurationException('You must provide a "stream" option for this logger.');
+            throw new \sfConfigurationException('You must provide a "stream" option for this logger.');
         }
 
         if (is_resource($options['stream']) && 'stream' != get_resource_type($options['stream'])) {
-            throw new sfConfigurationException('The provided "stream" option is not a stream.');
+            throw new \sfConfigurationException('The provided "stream" option is not a stream.');
         }
 
         $this->stream = $options['stream'];
diff --git a/lib/log/sfVarLogger.class.php b/lib/log/sfVarLogger.class.php
index ba0c4b34d..accd1712c 100644
--- a/lib/log/sfVarLogger.class.php
+++ b/lib/log/sfVarLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfVarLogger extends sfLogger
+class sfVarLogger extends \sfLogger
 {
-    protected $logs = array();
+    protected $logs = [];
     protected $xdebugLogging = false;
 
     /**
@@ -27,10 +28,10 @@ class sfVarLogger extends sfLogger
      *
      * - xdebug_logging: Whether to add xdebug trace to the logs (false by default).
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->xdebugLogging = isset($options['xdebug_logging']) ? $options['xdebug_logging'] : false;
 
@@ -67,7 +68,7 @@ public function getLogs()
      */
     public function getTypes()
     {
-        $types = array();
+        $types = [];
         foreach ($this->logs as $log) {
             if (!in_array($log['type'], $types)) {
                 $types[] = $log['type'];
@@ -86,7 +87,7 @@ public function getTypes()
      */
     public function getPriorities()
     {
-        $priorities = array();
+        $priorities = [];
         foreach ($this->logs as $log) {
             if (!in_array($log['priority'], $priorities)) {
                 $priorities[] = $log['priority'];
@@ -130,14 +131,14 @@ protected function doLog($message, $priority)
             $message = $matches[2];
         }
 
-        $this->logs[] = array(
+        $this->logs[] = [
             'priority' => $priority,
             'priority_name' => $this->getPriorityName($priority),
             'time' => time(),
             'message' => $message,
             'type' => $type,
             'debug_backtrace' => $this->getDebugBacktrace(),
-        );
+        ];
     }
 
     /**
@@ -151,7 +152,7 @@ protected function getDebugBacktrace()
     {
         // if we have xdebug and dev has not disabled the feature, add some stack information
         if (!$this->xdebugLogging || !function_exists('debug_backtrace')) {
-            return array();
+            return [];
         }
 
         $traces = debug_backtrace();
@@ -162,7 +163,7 @@ protected function getDebugBacktrace()
 
             if (
                 !class_exists($class)
-                || (!in_array($class, array('sfLogger', 'sfEventDispatcher')) && !is_subclass_of($class, 'sfLogger') && !is_subclass_of($class, 'sfEventDispatcher'))
+                || (!in_array($class, ['sfLogger', 'sfEventDispatcher']) && !is_subclass_of($class, 'sfLogger') && !is_subclass_of($class, 'sfEventDispatcher'))
             ) {
                 $traces = array_slice($traces, $i);
 
diff --git a/lib/log/sfWebDebugLogger.class.php b/lib/log/sfWebDebugLogger.class.php
index 94088f470..46ca7ae74 100644
--- a/lib/log/sfWebDebugLogger.class.php
+++ b/lib/log/sfWebDebugLogger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,15 +16,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugLogger extends sfVarLogger
+class sfWebDebugLogger extends \sfVarLogger
 {
-    /** @var sfContext */
+    /** @var \sfContext */
     protected $context;
 
     /** @var string */
     protected $webDebugClass;
 
-    /** @var sfWebDebug */
+    /** @var \sfWebDebug */
     protected $webDebug;
 
     /**
@@ -33,20 +34,20 @@ class sfWebDebugLogger extends sfVarLogger
      *
      *  * web_debug_class: The web debug class (sfWebDebug by default)
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param array             $options    an array of options
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param array              $options    an array of options
      *
-     * @see sfVarLogger
+     * @see \sfVarLogger
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
-        $this->context = sfContext::getInstance();
+        $this->context = \sfContext::getInstance();
 
         $this->webDebugClass = isset($options['web_debug_class']) ? $options['web_debug_class'] : 'sfWebDebug';
 
-        if (sfConfig::get('sf_web_debug')) {
-            $dispatcher->connect('context.load_factories', array($this, 'listenForLoadFactories'));
-            $dispatcher->connect('response.filter_content', array($this, 'filterResponseContent'));
+        if (\sfConfig::get('sf_web_debug')) {
+            $dispatcher->connect('context.load_factories', [$this, 'listenForLoadFactories']);
+            $dispatcher->connect('response.filter_content', [$this, 'filterResponseContent']);
         }
 
         $this->registerErrorHandler();
@@ -69,7 +70,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
      *
      * @return bool
      */
-    public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext = array())
+    public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext = [])
     {
         if (($errno & error_reporting()) == 0) {
             return false;
@@ -79,22 +80,22 @@ public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext
 
         switch ($errno) {
             case E_STRICT:
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('priority' => sfLogger::ERR, sprintf($message, 'Strict notice'))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['priority' => \sfLogger::ERR, sprintf($message, 'Strict notice')]));
 
                 break;
 
             case E_NOTICE:
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('priority' => sfLogger::NOTICE, sprintf($message, 'Notice'))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['priority' => \sfLogger::NOTICE, sprintf($message, 'Notice')]));
 
                 break;
 
             case E_WARNING:
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('priority' => sfLogger::WARNING, sprintf($message, 'Warning'))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['priority' => \sfLogger::WARNING, sprintf($message, 'Warning')]));
 
                 break;
 
             case E_RECOVERABLE_ERROR:
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('priority' => sfLogger::ERR, sprintf($message, 'Error'))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['priority' => \sfLogger::ERR, sprintf($message, 'Error')]));
 
                 break;
         }
@@ -105,37 +106,37 @@ public function handlePhpError($errno, $errstr, $errfile, $errline, $errcontext
     /**
      * Listens for the context.load_factories event.
      */
-    public function listenForLoadFactories(sfEvent $event)
+    public function listenForLoadFactories(\sfEvent $event)
     {
-        $path = sprintf('%s/%s/images', $event->getSubject()->getRequest()->getRelativeUrlRoot(), sfConfig::get('sf_web_debug_web_dir'));
+        $path = sprintf('%s/%s/images', $event->getSubject()->getRequest()->getRelativeUrlRoot(), \sfConfig::get('sf_web_debug_web_dir'));
         $path = str_replace('//', '/', $path);
 
-        $this->webDebug = new $this->webDebugClass($this->dispatcher, $this, array(
+        $this->webDebug = new $this->webDebugClass($this->dispatcher, $this, [
             'image_root_path' => $path,
             'request_parameters' => $event->getSubject()->getRequest()->getParameterHolder()->getAll(),
-        ));
+        ]);
     }
 
     /**
      * Listens to the response.filter_content event.
      *
-     * @param sfEvent $event   The sfEvent instance
-     * @param string  $content The response content
+     * @param \sfEvent $event   The sfEvent instance
+     * @param string   $content The response content
      *
      * @return string The filtered response content
      */
-    public function filterResponseContent(sfEvent $event, $content)
+    public function filterResponseContent(\sfEvent $event, $content)
     {
-        if (!sfConfig::get('sf_web_debug')) {
+        if (!\sfConfig::get('sf_web_debug')) {
             return $content;
         }
 
         // log timers information
-        $messages = array();
-        foreach (sfTimerManager::getTimers() as $name => $timer) {
+        $messages = [];
+        foreach (\sfTimerManager::getTimers() as $name => $timer) {
             $messages[] = sprintf('%s %.2f ms (%d)', $name, $timer->getElapsedTime() * 1000, $timer->getCalls());
         }
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', $messages));
+        $this->dispatcher->notify(new \sfEvent($this, 'application.log', $messages));
 
         // don't add debug toolbar:
         // * for XHR requests
@@ -144,7 +145,7 @@ public function filterResponseContent(sfEvent $event, $content)
         // * if HTTP headers only
         $response = $event->getSubject();
 
-        /** @var sfWebRequest $request */
+        /** @var \sfWebRequest $request */
         $request = $this->context->getRequest();
         if (
             null === $this->webDebug
@@ -152,9 +153,9 @@ public function filterResponseContent(sfEvent $event, $content)
             || !$this->context->has('response')
             || !$this->context->has('controller')
             || $request->isXmlHttpRequest()
-            || false === strpos($response->getContentType(), 'html')
+            ||   !str_contains($response->getContentType(), 'html')
             || '3' == substr($response->getStatusCode(), 0, 1)
-            || sfView::RENDER_CLIENT != $this->context->getController()->getRenderMode()
+            || \sfView::RENDER_CLIENT != $this->context->getController()->getRenderMode()
             || $response->isHeaderOnly()
         ) {
             return $content;
@@ -168,6 +169,6 @@ public function filterResponseContent(sfEvent $event, $content)
      */
     protected function registerErrorHandler()
     {
-        set_error_handler(array($this, 'handlePhpError'));
+        set_error_handler([$this, 'handlePhpError']);
     }
 }
diff --git a/lib/mailer/sfMailer.class.php b/lib/mailer/sfMailer.class.php
index bb55247f4..a869947c7 100755
--- a/lib/mailer/sfMailer.class.php
+++ b/lib/mailer/sfMailer.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfMailer extends Swift_Mailer
+class sfMailer extends \Swift_Mailer
 {
     public const REALTIME = 'realtime';
     public const SPOOL = 'spool';
@@ -47,29 +48,29 @@ class sfMailer extends Swift_Mailer
      *  *   * class: The main transport class
      *  *   * param: The main transport parameters
      *
-     * @param sfEventDispatcher $dispatcher An event dispatcher instance
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher An event dispatcher instance
+     * @param array              $options    An array of options
      */
-    public function __construct(sfEventDispatcher $dispatcher, $options)
+    public function __construct(\sfEventDispatcher $dispatcher, $options)
     {
         // options
-        $options = array_merge(array(
+        $options = array_merge([
             'charset' => 'UTF-8',
             'logging' => false,
             'delivery_strategy' => self::REALTIME,
-            'transport' => array(
+            'transport' => [
                 'class' => 'Swift_MailTransport',
-                'param' => array(),
-            ),
-        ), $options);
+                'param' => [],
+            ],
+        ], $options);
 
         $constantName = 'sfMailer::'.strtoupper($options['delivery_strategy']);
         $this->strategy = defined($constantName) ? constant($constantName) : false;
         if (!$this->strategy) {
-            throw new InvalidArgumentException(sprintf('Unknown mail delivery strategy "%s" (should be one of realtime, spool, single_address, or none)', $options['delivery_strategy']));
+            throw new \InvalidArgumentException(sprintf('Unknown mail delivery strategy "%s" (should be one of realtime, spool, single_address, or none)', $options['delivery_strategy']));
         }
 
-        if (sfMailer::NONE == $this->strategy) {
+        if (\sfMailer::NONE == $this->strategy) {
             $options['transport']['class'] = 'Swift_NullTransport';
         }
 
@@ -92,49 +93,49 @@ public function __construct(sfEventDispatcher $dispatcher, $options)
         }
         $this->realtimeTransport = $transport;
 
-        if (sfMailer::SPOOL == $this->strategy) {
+        if (\sfMailer::SPOOL == $this->strategy) {
             if (!isset($options['spool_class'])) {
-                throw new InvalidArgumentException('For the spool mail delivery strategy, you must also define a spool_class option');
+                throw new \InvalidArgumentException('For the spool mail delivery strategy, you must also define a spool_class option');
             }
-            $arguments = isset($options['spool_arguments']) ? $options['spool_arguments'] : array();
+            $arguments = isset($options['spool_arguments']) ? $options['spool_arguments'] : [];
 
             if ($arguments) {
-                $r = new ReflectionClass($options['spool_class']);
+                $r = new \ReflectionClass($options['spool_class']);
                 $this->spool = $r->newInstanceArgs($arguments);
             } else {
                 $this->spool = new $options['spool_class']();
             }
 
-            $transport = new Swift_SpoolTransport($this->spool);
-        } elseif (sfMailer::SINGLE_ADDRESS == $this->strategy) {
+            $transport = new \Swift_SpoolTransport($this->spool);
+        } elseif (\sfMailer::SINGLE_ADDRESS == $this->strategy) {
             if (!isset($options['delivery_address'])) {
-                throw new InvalidArgumentException('For the single_address mail delivery strategy, you must also define a delivery_address option');
+                throw new \InvalidArgumentException('For the single_address mail delivery strategy, you must also define a delivery_address option');
             }
 
             $this->address = $options['delivery_address'];
 
-            $transport->registerPlugin($this->redirectingPlugin = new Swift_Plugins_RedirectingPlugin($this->address));
+            $transport->registerPlugin($this->redirectingPlugin = new \Swift_Plugins_RedirectingPlugin($this->address));
         }
 
         parent::__construct($transport);
 
         // logger
         if ($options['logging']) {
-            $this->logger = new sfMailerMessageLoggerPlugin($dispatcher);
+            $this->logger = new \sfMailerMessageLoggerPlugin($dispatcher);
 
             $transport->registerPlugin($this->logger);
         }
 
         // preferences
-        Swift_Preferences::getInstance()->setCharset($options['charset']);
+        \Swift_Preferences::getInstance()->setCharset($options['charset']);
 
-        $dispatcher->notify(new sfEvent($this, 'mailer.configure'));
+        $dispatcher->notify(new \sfEvent($this, 'mailer.configure'));
     }
 
     /**
      * Gets the realtime transport instance.
      *
-     * @return Swift_Transport the realtime transport instance
+     * @return \Swift_Transport the realtime transport instance
      */
     public function getRealtimeTransport()
     {
@@ -144,9 +145,9 @@ public function getRealtimeTransport()
     /**
      * Sets the realtime transport instance.
      *
-     * @param Swift_Transport $transport the realtime transport instance
+     * @param \Swift_Transport $transport the realtime transport instance
      */
-    public function setRealtimeTransport(Swift_Transport $transport)
+    public function setRealtimeTransport(\Swift_Transport $transport)
     {
         $this->realtimeTransport = $transport;
     }
@@ -154,7 +155,7 @@ public function setRealtimeTransport(Swift_Transport $transport)
     /**
      * Gets the logger instance.
      *
-     * @return sfMailerMessageLoggerPlugin the logger instance
+     * @return \sfMailerMessageLoggerPlugin the logger instance
      */
     public function getLogger()
     {
@@ -164,7 +165,7 @@ public function getLogger()
     /**
      * Sets the logger instance.
      *
-     * @param sfMailerMessageLoggerPlugin $logger the logger instance
+     * @param \sfMailerMessageLoggerPlugin $logger the logger instance
      */
     public function setLogger($logger)
     {
@@ -200,7 +201,7 @@ public function setDeliveryAddress($address)
     {
         $this->address = $address;
 
-        if (sfMailer::SINGLE_ADDRESS == $this->strategy) {
+        if (\sfMailer::SINGLE_ADDRESS == $this->strategy) {
             $this->redirectingPlugin->setRecipient($address);
         }
     }
@@ -213,11 +214,11 @@ public function setDeliveryAddress($address)
      * @param string       $subject The subject
      * @param string       $body    The body
      *
-     * @return Swift_Message A Swift_Message instance
+     * @return \Swift_Message A Swift_Message instance
      */
     public function compose($from = null, $to = null, $subject = null, $body = null)
     {
-        $msg = new Swift_Message();
+        $msg = new \Swift_Message();
 
         return $msg
             ->setFrom($from)
@@ -245,7 +246,7 @@ public function composeAndSend($from, $to, $subject, $body)
     /**
      * Forces the next call to send() to use the realtime strategy.
      *
-     * @return sfMailer The current sfMailer instance
+     * @return \sfMailer The current sfMailer instance
      */
     public function sendNextImmediately()
     {
@@ -294,7 +295,7 @@ public function flushQueue(&$failedRecipients = null)
     public function getSpool()
     {
         if (self::SPOOL != $this->strategy) {
-            throw new LogicException(sprintf('You can only send messages in the spool if the delivery strategy is "spool" (%s is the current strategy).', $this->strategy));
+            throw new \LogicException(sprintf('You can only send messages in the spool if the delivery strategy is "spool" (%s is the current strategy).', $this->strategy));
         }
 
         return $this->spool;
diff --git a/lib/mailer/sfMailerMessageLoggerPlugin.class.php b/lib/mailer/sfMailerMessageLoggerPlugin.class.php
index 0f552beb4..cb638d84c 100644
--- a/lib/mailer/sfMailerMessageLoggerPlugin.class.php
+++ b/lib/mailer/sfMailerMessageLoggerPlugin.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfMailerMessageLoggerPlugin implements Swift_Events_SendListener
+class sfMailerMessageLoggerPlugin implements \Swift_Events_SendListener
 {
-    protected $messages = array();
+    protected $messages = [];
     protected $dispatcher;
 
     /**
      * Constructor.
      *
-     * @param sfEventDispatcher $dispatcher An event dispatcher instance
+     * @param \sfEventDispatcher $dispatcher An event dispatcher instance
      */
-    public function __construct(sfEventDispatcher $dispatcher)
+    public function __construct(\sfEventDispatcher $dispatcher)
     {
         $this->dispatcher = $dispatcher;
     }
@@ -35,7 +36,7 @@ public function __construct(sfEventDispatcher $dispatcher)
      */
     public function clear()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
@@ -61,19 +62,19 @@ public function countMessages()
     /**
      * Invoked immediately before the Message is sent.
      */
-    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    public function beforeSendPerformed(\Swift_Events_SendEvent $evt)
     {
         $this->messages[] = $message = clone $evt->getMessage();
 
         $to = null === $message->getTo() ? '' : implode(', ', array_keys($message->getTo()));
 
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Sending email "%s" to "%s"', $message->getSubject(), $to))));
+        $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Sending email "%s" to "%s"', $message->getSubject(), $to)]));
     }
 
     /**
      * Invoked immediately after the Message is sent.
      */
-    public function sendPerformed(Swift_Events_SendEvent $evt)
+    public function sendPerformed(\Swift_Events_SendEvent $evt)
     {
     }
 }
diff --git a/lib/mailer/sfNoMailer.class.php b/lib/mailer/sfNoMailer.class.php
index 08165a518..089e9ce67 100644
--- a/lib/mailer/sfNoMailer.class.php
+++ b/lib/mailer/sfNoMailer.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * sfMailer is the main entry point for the mailer system - sfNoMailer disable all mailer features.
  */
 class sfNoMailer
 {
-    public function __construct(sfEventDispatcher $dispatcher, $options)
+    public function __construct(\sfEventDispatcher $dispatcher, $options)
     {
     }
 
@@ -14,7 +23,7 @@ public function getRealtimeTransport()
         return null;
     }
 
-    public function setRealtimeTransport(Swift_Transport $transport)
+    public function setRealtimeTransport(\Swift_Transport $transport)
     {
     }
 
diff --git a/lib/plugin/sfPearConfig.class.php b/lib/plugin/sfPearConfig.class.php
index 20a2edbe9..770ecd12e 100644
--- a/lib/plugin/sfPearConfig.class.php
+++ b/lib/plugin/sfPearConfig.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearConfig extends PEAR_Config
+class sfPearConfig extends \PEAR_Config
 {
-    public function &getREST($version, $options = array())
+    public function &getREST($version, $options = [])
     {
         $class = 'sfPearRest'.str_replace('.', '', $version);
 
diff --git a/lib/plugin/sfPearDownloader.class.php b/lib/plugin/sfPearDownloader.class.php
index 00d3be637..bdff41971 100644
--- a/lib/plugin/sfPearDownloader.class.php
+++ b/lib/plugin/sfPearDownloader.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,13 +18,13 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearDownloader extends PEAR_Downloader
+class sfPearDownloader extends \PEAR_Downloader
 {
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed|null $callback
-     * @param mixed|null $lastmodified
+     * @param \mixed|null $callback
+     * @param \mixed|null $lastmodified
      */
     public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
     {
diff --git a/lib/plugin/sfPearEnvironment.class.php b/lib/plugin/sfPearEnvironment.class.php
index 071a5f5e8..741778dff 100644
--- a/lib/plugin/sfPearEnvironment.class.php
+++ b/lib/plugin/sfPearEnvironment.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -40,15 +41,15 @@ class sfPearEnvironment
     protected $registry;
     protected $rest;
     protected $frontend;
-    protected $options = array();
+    protected $options = [];
 
     /**
      * Constructs a new sfPluginManager.
      *
-     * @param sfEventDispatcher $dispatcher An event dispatcher instance
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher An event dispatcher instance
+     * @param array              $options    An array of options
      */
-    public function __construct(sfEventDispatcher $dispatcher, $options)
+    public function __construct(\sfEventDispatcher $dispatcher, $options)
     {
         $this->initialize($dispatcher, $options);
     }
@@ -65,20 +66,20 @@ public function __construct(sfEventDispatcher $dispatcher, $options)
      * * downloader_base_class: The base class for downloads (default to sfPearDownloader)
      *                          (mainly used for testing)
      *
-     * @param sfEventDispatcher $dispatcher An event dispatcher instance
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher An event dispatcher instance
+     * @param array              $options    An array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->dispatcher = $dispatcher;
 
         // initialize options
         if (!isset($options['plugin_dir'])) {
-            throw new sfConfigurationException('You must provide a "plugin_dir" option.');
+            throw new \sfConfigurationException('You must provide a "plugin_dir" option.');
         }
 
         if (!isset($options['cache_dir'])) {
-            throw new sfConfigurationException('You must provide a "cache_dir" option.');
+            throw new \sfConfigurationException('You must provide a "cache_dir" option.');
         }
 
         if (!is_dir($options['cache_dir']) && !@mkdir($options['cache_dir'], 0777, true) && !is_dir($options['cache_dir'])) {
@@ -101,7 +102,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
         $this->initializeFrontend();
 
         // initializes the REST object
-        $this->rest = new sfPearRestPlugin($this->config, array('base_class' => $options['rest_base_class']));
+        $this->rest = new \sfPearRestPlugin($this->config, ['base_class' => $options['rest_base_class']]);
         $this->rest->setChannel($this->config->get('default_channel'));
     }
 
@@ -192,9 +193,9 @@ public function registerChannel($channel, $isDefault = false)
 
         if (!$this->registry->channelExists($channel, true)) {
             $class = $this->options['downloader_base_class'];
-            $downloader = new $class($this->frontend, array(), $this->config);
+            $downloader = new $class($this->frontend, [], $this->config);
             if (!$downloader->discover($channel)) {
-                throw new sfPluginException(sprintf('Unable to register channel "%s"', $channel));
+                throw new \sfPluginException(sprintf('Unable to register channel "%s"', $channel));
             }
         }
 
@@ -212,7 +213,7 @@ public function registerChannel($channel, $isDefault = false)
      */
     public function initializeConfiguration($pluginDir, $cacheDir)
     {
-        $this->config = $GLOBALS['_PEAR_Config_instance'] = new sfPearConfig();
+        $this->config = $GLOBALS['_PEAR_Config_instance'] = new \sfPearConfig();
 
         // change the configuration for use
         $this->config->set('php_dir', $pluginDir);
@@ -238,9 +239,9 @@ public function initializeConfiguration($pluginDir, $cacheDir)
      */
     protected function initializeFrontend()
     {
-        $this->frontend = PEAR_Frontend::singleton('sfPearFrontendPlugin');
-        if (PEAR::isError($this->frontend)) {
-            throw new sfPluginException(sprintf('Unable to initialize PEAR Frontend object: %s', $this->frontend->getMessage()));
+        $this->frontend = \PEAR_Frontend::singleton('sfPearFrontendPlugin');
+        if (\PEAR::isError($this->frontend)) {
+            throw new \sfPluginException(sprintf('Unable to initialize PEAR Frontend object: %s', $this->frontend->getMessage()));
         }
 
         $this->frontend->setEventDispatcher($this->dispatcher);
@@ -252,8 +253,8 @@ protected function initializeFrontend()
     protected function initializeRegistry()
     {
         $this->registry = $this->config->getRegistry();
-        if (PEAR::isError($this->registry)) {
-            throw new sfPluginException(sprintf('Unable to initialize PEAR registry: %s', $this->registry->getMessage()));
+        if (\PEAR::isError($this->registry)) {
+            throw new \sfPluginException(sprintf('Unable to initialize PEAR registry: %s', $this->registry->getMessage()));
         }
     }
 }
diff --git a/lib/plugin/sfPearFrontendPlugin.class.php b/lib/plugin/sfPearFrontendPlugin.class.php
index 5290fe0fd..d7ee9ab0d 100644
--- a/lib/plugin/sfPearFrontendPlugin.class.php
+++ b/lib/plugin/sfPearFrontendPlugin.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,16 +20,16 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearFrontendPlugin extends PEAR_Frontend_CLI
+class sfPearFrontendPlugin extends \PEAR_Frontend_CLI
 {
     protected $dispatcher;
 
     /**
      * Sets the sfEventDispatcher object for this frontend.
      *
-     * @param sfEventDispatcher $dispatcher The sfEventDispatcher instance
+     * @param \sfEventDispatcher $dispatcher The sfEventDispatcher instance
      */
-    public function setEventDispatcher(sfEventDispatcher $dispatcher)
+    public function setEventDispatcher(\sfEventDispatcher $dispatcher)
     {
         $this->dispatcher = $dispatcher;
     }
@@ -40,12 +41,12 @@ public function _displayLine($text)
 
     public function _display($text)
     {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', $this->splitLongLine($text)));
+        $this->dispatcher->notify(new \sfEvent($this, 'application.log', $this->splitLongLine($text)));
     }
 
     protected function splitLongLine($text)
     {
-        $lines = array();
+        $lines = [];
         foreach (explode("\n", $text) as $longline) {
             foreach (explode("\n", wordwrap($longline, 62)) as $line) {
                 if ($line = trim($line)) {
diff --git a/lib/plugin/sfPearRest.class.php b/lib/plugin/sfPearRest.class.php
index d8cd6e6ad..f9b523b2a 100644
--- a/lib/plugin/sfPearRest.class.php
+++ b/lib/plugin/sfPearRest.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,15 +18,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearRest extends PEAR_REST
+class sfPearRest extends \PEAR_REST
 {
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed|null $lastmodified
+     * @param \mixed|null $lastmodified
      */
     public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
     {
-        return parent::downloadHttp($url, $lastmodified, array_merge(false !== $accept ? $accept : array(), array("\r\nX-SYMFONY-VERSION: ".SYMFONY_VERSION)));
+        return parent::downloadHttp($url, $lastmodified, array_merge(false !== $accept ? $accept : [], ["\r\nX-SYMFONY-VERSION: ".SYMFONY_VERSION]));
     }
 }
diff --git a/lib/plugin/sfPearRest10.class.php b/lib/plugin/sfPearRest10.class.php
index 007c15202..446a9b3f5 100644
--- a/lib/plugin/sfPearRest10.class.php
+++ b/lib/plugin/sfPearRest10.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +18,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearRest10 extends PEAR_REST_10
+class sfPearRest10 extends \PEAR_REST_10
 {
     /**
-     * @see PEAR_REST_10
+     * @see \PEAR_REST_10
      */
-    public function __construct($config, $options = array())
+    public function __construct($config, $options = [])
     {
         $class = isset($options['base_class']) ? $options['base_class'] : 'sfPearRest';
 
diff --git a/lib/plugin/sfPearRest11.class.php b/lib/plugin/sfPearRest11.class.php
index 239df17f5..e79eb06d2 100644
--- a/lib/plugin/sfPearRest11.class.php
+++ b/lib/plugin/sfPearRest11.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +18,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearRest11 extends PEAR_REST_11
+class sfPearRest11 extends \PEAR_REST_11
 {
     /**
-     * @see PEAR_REST_11
+     * @see \PEAR_REST_11
      */
-    public function __construct($config, $options = array())
+    public function __construct($config, $options = [])
     {
         $class = isset($options['base_class']) ? $options['base_class'] : 'sfPearRest';
 
diff --git a/lib/plugin/sfPearRestPlugin.class.php b/lib/plugin/sfPearRestPlugin.class.php
index f2eddfe19..1a9870890 100644
--- a/lib/plugin/sfPearRestPlugin.class.php
+++ b/lib/plugin/sfPearRestPlugin.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfPearRestPlugin extends sfPearRest11
+class sfPearRestPlugin extends \sfPearRest11
 {
     protected $config;
     protected $rest10;
@@ -25,15 +26,15 @@ class sfPearRestPlugin extends sfPearRest11
     /**
      * Constructs a new sfRestPlugin instance.
      *
-     * @param PEAR_Config $config  The PEAR Config object
-     * @param array       $options An array of options
+     * @param \PEAR_Config $config  The PEAR Config object
+     * @param array        $options An array of options
      */
-    public function __construct(PEAR_Config $config, $options = array())
+    public function __construct(\PEAR_Config $config, $options = [])
     {
         parent::__construct($config, $options);
 
         $this->config = $config;
-        $this->rest10 = new sfPearRest10($config, $options);
+        $this->rest10 = new \sfPearRest10($config, $options);
     }
 
     /**
@@ -45,7 +46,7 @@ public function __construct(PEAR_Config $config, $options = array())
     public function __call($method, $arguments)
     {
         if (method_exists($this->rest10, $method)) {
-            return call_user_func_array(array($this->rest10, $method), $arguments);
+            return call_user_func_array([$this->rest10, $method], $arguments);
         }
     }
 
@@ -72,8 +73,8 @@ public function getPluginLicense($plugin, $version)
     {
         $info = $this->packageInfo($this->restBase, $plugin);
 
-        if (PEAR::isError($info)) {
-            throw new sfPluginRestException(sprintf('Unable to get plugin licence information for plugin "%s": %s', $plugin, $info->getMessage()));
+        if (\PEAR::isError($info)) {
+            throw new \sfPluginRestException(sprintf('Unable to get plugin licence information for plugin "%s": %s', $plugin, $info->getMessage()));
         }
 
         if (null === $info) {
@@ -82,7 +83,7 @@ public function getPluginLicense($plugin, $version)
         }
 
         if (!isset($info['license']) || null === $info['license']) {
-            throw new Exception('No license found for this plugin!');
+            throw new \Exception('No license found for this plugin!');
         }
 
         return $info['releases'][$version]['license'];
@@ -99,19 +100,19 @@ public function getPluginLicense($plugin, $version)
     public function getPluginVersions($plugin, $stability = null)
     {
         $allreleases = $this->_rest->retrieveData($this->restBase.'r/'.strtolower($plugin).'/allreleases.xml');
-        if (PEAR::isError($allreleases)) {
-            throw new sfPluginRestException(sprintf('Unable to get information for plugin "%s": %s', $plugin, $allreleases->getMessage()));
+        if (\PEAR::isError($allreleases)) {
+            throw new \sfPluginRestException(sprintf('Unable to get information for plugin "%s": %s', $plugin, $allreleases->getMessage()));
         }
 
         if (!isset($allreleases['r']) || (isset($allreleases['r']) && !is_array($allreleases['r']) || !count($allreleases['r']))) {
-            throw new sfPluginRestException(sprintf('No release available for plugin "%s"', $plugin));
+            throw new \sfPluginRestException(sprintf('No release available for plugin "%s"', $plugin));
         }
 
         if (!isset($allreleases['r'][0])) {
-            $allreleases['r'] = array($allreleases['r']);
+            $allreleases['r'] = [$allreleases['r']];
         }
 
-        $versions = array();
+        $versions = [];
         $allowedStates = $this->getAllowedStates($stability);
         foreach ($allreleases['r'] as $release) {
             if (!isset($allowedStates[$release['s']])) {
@@ -122,7 +123,7 @@ public function getPluginVersions($plugin, $stability = null)
         }
 
         if (!count($versions)) {
-            throw new sfPluginException(sprintf('No release available for plugin "%s" in state "%s"', $plugin, $stability));
+            throw new \sfPluginException(sprintf('No release available for plugin "%s" in state "%s"', $plugin, $stability));
         }
 
         return $versions;
@@ -139,8 +140,8 @@ public function getPluginVersions($plugin, $stability = null)
     public function getPluginDependencies($plugin, $version)
     {
         $dependencies = $this->_rest->retrieveData($this->restBase.'r/'.strtolower($plugin).'/deps.'.$version.'.txt');
-        if (PEAR::isError($dependencies)) {
-            throw new sfPluginRestException(sprintf('Unable to get dependencies information for plugin "%s": %s', $plugin, $dependencies->getMessage()));
+        if (\PEAR::isError($dependencies)) {
+            throw new \sfPluginRestException(sprintf('Unable to get dependencies information for plugin "%s": %s', $plugin, $dependencies->getMessage()));
         }
 
         return unserialize($dependencies);
@@ -159,16 +160,16 @@ public function getPluginDownloadURL($plugin, $version, $stability)
     {
         $installed = $this->config->getRegistry()->packageInfo($plugin, 'version', $this->channel);
         if ($installed >= $version) {
-            throw new sfPluginException(sprintf('Plugin "%s" version "%s" is already installed (you tried to install version "%s")', $plugin, $installed, $version));
+            throw new \sfPluginException(sprintf('Plugin "%s" version "%s" is already installed (you tried to install version "%s")', $plugin, $installed, $version));
         }
 
-        $info = $this->getDownloadURL($this->restBase, array('channel' => $this->channel, 'package' => $plugin, 'version' => $version), $stability, $installed);
-        if (PEAR::isError($info)) {
-            throw new sfPluginRestException(sprintf('Unable to get download information for plugin "%s | %s | %s": %s', $plugin, $version, $stability, $info->getMessage()));
+        $info = $this->getDownloadURL($this->restBase, ['channel' => $this->channel, 'package' => $plugin, 'version' => $version], $stability, $installed);
+        if (\PEAR::isError($info)) {
+            throw new \sfPluginRestException(sprintf('Unable to get download information for plugin "%s | %s | %s": %s', $plugin, $version, $stability, $info->getMessage()));
         }
 
         if (!isset($info['url'])) {
-            throw new sfPluginRestException(sprintf('Plugin "%s" cannot be installed (No URL found)', $plugin));
+            throw new \sfPluginRestException(sprintf('Plugin "%s" cannot be installed (No URL found)', $plugin));
         }
 
         return $info['url'].(extension_loaded('zlib') ? '.tgz' : '.tar');
@@ -182,14 +183,14 @@ public function getPluginDownloadURL($plugin, $version, $stability)
     protected function getRESTBase($channelName)
     {
         $channel = $this->config->getRegistry()->getChannel($channelName);
-        if (PEAR::isError($channel)) {
-            throw new sfPluginException(sprintf('Unable to initialize channel "%s"', $channel->getMessage()));
+        if (\PEAR::isError($channel)) {
+            throw new \sfPluginException(sprintf('Unable to initialize channel "%s"', $channel->getMessage()));
         }
 
         $mirror = $this->config->get('preferred_mirror', null, $channelName);
 
         if (!$channel->supportsREST($mirror)) {
-            throw new sfPluginRestException(sprintf('The channel "%s" does not support the REST protocol', $channelName));
+            throw new \sfPluginRestException(sprintf('The channel "%s" does not support the REST protocol', $channelName));
         }
 
         return $channel->getBaseURL('REST1.1', $mirror);
diff --git a/lib/plugin/sfPluginDependencyException.class.php b/lib/plugin/sfPluginDependencyException.class.php
index 67ede6c99..8a963b550 100644
--- a/lib/plugin/sfPluginDependencyException.class.php
+++ b/lib/plugin/sfPluginDependencyException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginDependencyException extends sfPluginException
+class sfPluginDependencyException extends \sfPluginException
 {
 }
diff --git a/lib/plugin/sfPluginException.class.php b/lib/plugin/sfPluginException.class.php
index 6b5a7ae97..5ea36de1f 100644
--- a/lib/plugin/sfPluginException.class.php
+++ b/lib/plugin/sfPluginException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginException extends sfException
+class sfPluginException extends \sfException
 {
 }
diff --git a/lib/plugin/sfPluginManager.class.php b/lib/plugin/sfPluginManager.class.php
index 5b7eb1723..d7e40a75c 100644
--- a/lib/plugin/sfPluginManager.class.php
+++ b/lib/plugin/sfPluginManager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,15 +20,15 @@ class sfPluginManager
 {
     protected $dispatcher;
     protected $environment;
-    protected $installing = array();
+    protected $installing = [];
 
     /**
      * Constructs a new sfPluginManager.
      *
-     * @param sfEventDispatcher $dispatcher  An event dispatcher instance
-     * @param sfPearEnvironment $environment A sfPearEnvironment instance
+     * @param \sfEventDispatcher $dispatcher  An event dispatcher instance
+     * @param \sfPearEnvironment $environment A sfPearEnvironment instance
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
+    public function __construct(\sfEventDispatcher $dispatcher, \sfPearEnvironment $environment)
     {
         $this->initialize($dispatcher, $environment);
     }
@@ -37,10 +38,10 @@ public function __construct(sfEventDispatcher $dispatcher, sfPearEnvironment $en
      *
      * see sfPearEnvironment for available options.
      *
-     * @param sfEventDispatcher $dispatcher  An event dispatcher instance
-     * @param sfPearEnvironment $environment A sfPearEnvironment instance
+     * @param \sfEventDispatcher $dispatcher  An event dispatcher instance
+     * @param \sfPearEnvironment $environment A sfPearEnvironment instance
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
+    public function initialize(\sfEventDispatcher $dispatcher, \sfPearEnvironment $environment)
     {
         $this->dispatcher = $dispatcher;
         $this->environment = $environment;
@@ -59,7 +60,7 @@ public function configure()
     /**
      * Returns the sfPearEnvironment instance.
      *
-     * @return sfPearEnvironment The sfPearEnvironment instance
+     * @return \sfPearEnvironment The sfPearEnvironment instance
      */
     public function getEnvironment()
     {
@@ -73,7 +74,7 @@ public function getEnvironment()
      */
     public function getInstalledPlugins()
     {
-        $installed = array();
+        $installed = [];
         foreach ($this->environment->getRegistry()->packageInfo(null, null, null) as $channel => $packages) {
             foreach ($packages as $package) {
                 $installed[] = $this->environment->getRegistry()->getPackage(isset($package['package']) ? $package['package'] : $package['name'], $channel);
@@ -101,9 +102,9 @@ public function getInstalledPlugins()
      *
      * @return bool|string true if the plugin is already installed, the name of the installed plugin otherwise
      */
-    public function installPlugin($plugin, $options = array())
+    public function installPlugin($plugin, $options = [])
     {
-        $this->installing = array();
+        $this->installing = [];
 
         return $this->doInstallPlugin($plugin, $options);
     }
@@ -116,7 +117,7 @@ public function installPlugin($plugin, $options = array())
      */
     public function uninstallPlugin($plugin, $channel = null)
     {
-        if (false !== strpos($plugin, '/')) {
+        if (str_contains($plugin, '/')) {
             list($channel, $plugin) = explode('/', $plugin);
         }
 
@@ -124,29 +125,29 @@ public function uninstallPlugin($plugin, $channel = null)
 
         $existing = $this->environment->getRegistry()->packageInfo($plugin, 'version', $channel);
         if (null === $existing) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Plugin "%s" is not installed', $plugin))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Plugin "%s" is not installed', $plugin)]));
 
             return false;
         }
 
-        $this->dispatcher->notify(new sfEvent($this, 'plugin.pre_uninstall', array('channel' => $channel, 'plugin' => $plugin)));
+        $this->dispatcher->notify(new \sfEvent($this, 'plugin.pre_uninstall', ['channel' => $channel, 'plugin' => $plugin]));
 
         $package = $this->environment->getRegistry()->parsePackageName($plugin, $channel);
 
-        $installer = new PEAR_Installer($this);
-        $packages = array($this->environment->getRegistry()->getPackage($plugin, $channel));
+        $installer = new \PEAR_Installer($this);
+        $packages = [$this->environment->getRegistry()->getPackage($plugin, $channel)];
         $installer->setUninstallPackages($packages);
         $ret = $installer->uninstall($package);
-        if (PEAR::isError($ret)) {
-            throw new sfPluginException(sprintf('Problem uninstalling plugin "%s": %s', $plugin, $ret->getMessage()));
+        if (\PEAR::isError($ret)) {
+            throw new \sfPluginException(sprintf('Problem uninstalling plugin "%s": %s', $plugin, $ret->getMessage()));
         }
 
         if ($ret) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Uninstallation successful for plugin "%s"', $plugin))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Uninstallation successful for plugin "%s"', $plugin)]));
 
-            $this->dispatcher->notify(new sfEvent($this, 'plugin.post_uninstall', array('channel' => $channel, 'plugin' => $plugin)));
+            $this->dispatcher->notify(new \sfEvent($this, 'plugin.post_uninstall', ['channel' => $channel, 'plugin' => $plugin]));
         } else {
-            throw new sfPluginException(sprintf('Uninstallation of "%s" plugin failed', $plugin));
+            throw new \sfPluginException(sprintf('Uninstallation of "%s" plugin failed', $plugin));
         }
 
         return $ret;
@@ -174,7 +175,7 @@ public function checkPluginDependencies($plugin, $version, $options = false)
 
         $deps = $dependencies['required']['package'];
         if (!isset($deps[0])) {
-            $deps = array($deps);
+            $deps = [$deps];
         }
 
         foreach ($deps as $dependency) {
@@ -183,15 +184,15 @@ public function checkPluginDependencies($plugin, $version, $options = false)
 
                 if (isset($options['install_deps']) && $options['install_deps']) {
                     try {
-                        $this->doInstallPlugin($dependency['name'], array_merge($options, array('channel' => $dependency['channel'])));
-                    } catch (sfException $e) {
-                        throw new sfPluginRecursiveDependencyException(sprintf('Unable to install plugin "%s" (version %s) because it depends on plugin "%s" which cannot be installed automatically: %s', $plugin, $version, $dependency['name'], $e->getMessage()));
+                        $this->doInstallPlugin($dependency['name'], array_merge($options, ['channel' => $dependency['channel']]));
+                    } catch (\sfException $e) {
+                        throw new \sfPluginRecursiveDependencyException(sprintf('Unable to install plugin "%s" (version %s) because it depends on plugin "%s" which cannot be installed automatically: %s', $plugin, $version, $dependency['name'], $e->getMessage()));
                     }
 
                     continue;
                 }
 
-                throw new sfPluginDependencyException(sprintf('Unable to install plugin "%s" (version %s) because it depends on plugin "%s" which is not installed (install dependencies by hand or use the --install_deps option for automatic installation).', $plugin, $version, $dependency['name']));
+                throw new \sfPluginDependencyException(sprintf('Unable to install plugin "%s" (version %s) because it depends on plugin "%s" which is not installed (install dependencies by hand or use the --install_deps option for automatic installation).', $plugin, $version, $dependency['name']));
             }
         }
     }
@@ -215,7 +216,7 @@ public function getPluginVersion($plugin, $stability = null)
             return $version;
         }
 
-        throw new sfPluginDependencyException(sprintf('No release available for plugin "%s" in state "%s" that satisfies the application requirements.', $plugin, $stability));
+        throw new \sfPluginDependencyException(sprintf('No release available for plugin "%s" in state "%s" that satisfies the application requirements.', $plugin, $stability));
     }
 
     /**
@@ -236,7 +237,7 @@ public function isPluginCompatible($plugin, $version)
 
         $deps = $dependencies['required']['package'];
         if (!isset($deps[0])) {
-            $deps = array($deps);
+            $deps = [$deps];
         }
 
         foreach ($deps as $dependency) {
@@ -258,7 +259,7 @@ public function isPluginCompatible($plugin, $version)
      *
      * @see installPlugin() for available options
      */
-    public function getPluginLicense($plugin, $options = array())
+    public function getPluginLicense($plugin, $options = [])
     {
         $channel = isset($options['channel']) ? $options['channel'] : $this->environment->getConfig()->get('default_channel');
         $stability = isset($options['stability']) ? $options['stability'] : $this->environment->getConfig()->get('preferred_state', null, $channel);
@@ -270,13 +271,13 @@ public function getPluginLicense($plugin, $options = array())
         if (null === $version) {
             try {
                 $version = $this->getPluginVersion($plugin, $stability);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 // no release available
                 return false;
             }
         } else {
             if (!$this->isPluginCompatible($plugin, $version)) {
-                throw new sfPluginDependencyException(sprintf('Plugin "%s" in version "%s" is not compatible with the current application', $plugin, $version));
+                throw new \sfPluginDependencyException(sprintf('Plugin "%s" in version "%s" is not compatible with the current application', $plugin, $version));
             }
         }
 
@@ -288,48 +289,48 @@ public function getPluginLicense($plugin, $options = array())
      *
      * @see installPlugin()
      */
-    protected function doInstallPlugin($plugin, $options = array())
+    protected function doInstallPlugin($plugin, $options = [])
     {
         $channel = isset($options['channel']) ? $options['channel'] : $this->environment->getConfig()->get('default_channel');
         $stability = isset($options['stability']) ? $options['stability'] : $this->environment->getConfig()->get('preferred_state', null, $channel);
         $version = isset($options['version']) ? $options['version'] : null;
 
         $isPackage = true;
-        if (0 === strpos($plugin, 'http://') || file_exists($plugin)) {
-            if (0 === strpos($plugin, 'http://plugins.symfony-project.')) {
-                throw new sfPluginException("You try to install a symfony 1.0 plugin.\nPlease read the help message of this task to know how to install a plugin for the current version of symfony.");
+        if (str_starts_with($plugin, 'http://') || file_exists($plugin)) {
+            if (str_starts_with($plugin, 'http://plugins.symfony-project.')) {
+                throw new \sfPluginException("You try to install a symfony 1.0 plugin.\nPlease read the help message of this task to know how to install a plugin for the current version of symfony.");
             }
 
             $download = $plugin;
             $isPackage = false;
-        } elseif (false !== strpos($plugin, '/')) {
+        } elseif (str_contains($plugin, '/')) {
             list($channel, $plugin) = explode('/', $plugin);
         }
 
-        $this->dispatcher->notify(new sfEvent($this, 'plugin.pre_install', array('channel' => $channel, 'plugin' => $plugin, 'is_package' => $isPackage)));
+        $this->dispatcher->notify(new \sfEvent($this, 'plugin.pre_install', ['channel' => $channel, 'plugin' => $plugin, 'is_package' => $isPackage]));
 
         if ($isPackage) {
             $this->environment->getRest()->setChannel($channel);
 
             if (!preg_match(PEAR_COMMON_PACKAGE_NAME_PREG, $plugin)) {
-                throw new sfPluginException(sprintf('Plugin name "%s" is not a valid package name', $plugin));
+                throw new \sfPluginException(sprintf('Plugin name "%s" is not a valid package name', $plugin));
             }
 
             if (!$version) {
                 $version = $this->getPluginVersion($plugin, $stability);
             } else {
                 if (!$this->isPluginCompatible($plugin, $version)) {
-                    throw new sfPluginDependencyException(sprintf('Plugin "%s" in version "%s" is not compatible with the current application', $plugin, $version));
+                    throw new \sfPluginDependencyException(sprintf('Plugin "%s" in version "%s" is not compatible with the current application', $plugin, $version));
                 }
             }
 
             if (!preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $version)) {
-                throw new sfPluginException(sprintf('Plugin version "%s" is not a valid version', $version));
+                throw new \sfPluginException(sprintf('Plugin version "%s" is not a valid version', $version));
             }
 
             $existing = $this->environment->getRegistry()->packageInfo($plugin, 'version', $channel);
             if (0 === version_compare($existing, $version)) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Plugin is already installed')));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Plugin is already installed']));
 
                 return true;
             }
@@ -341,72 +342,72 @@ protected function doInstallPlugin($plugin, $options = array())
 
             // convert the plugin package into a discrete download URL
             $download = $this->environment->getRest()->getPluginDownloadURL($plugin, $version, $stability);
-            if (PEAR::isError($download)) {
-                throw new sfPluginException(sprintf('Problem downloading the plugin "%s": %s', $plugin, $download->getMessage()));
+            if (\PEAR::isError($download)) {
+                throw new \sfPluginException(sprintf('Problem downloading the plugin "%s": %s', $plugin, $download->getMessage()));
             }
         }
 
         // download the plugin and install
         $class = $this->environment->getOption('downloader_base_class');
-        $downloader = new $class($this, array('upgrade' => true), $this->environment->getConfig());
+        $downloader = new $class($this, ['upgrade' => true], $this->environment->getConfig());
 
         $this->installing[$channel.'/'.$plugin] = true;
 
         if ($isPackage) {
-            $this->checkPluginDependencies($plugin, $version, array(
+            $this->checkPluginDependencies($plugin, $version, [
                 'install_deps' => isset($options['install_deps']) ? (bool) $options['install_deps'] : false,
                 'stability' => $stability,
-            ));
+            ]);
         }
 
         // download the actual URL to the plugin
-        $downloaded = $downloader->download(array($download));
-        if (PEAR::isError($downloaded)) {
-            throw new sfPluginException(sprintf('Problem when downloading "%s": %s', $download, $downloaded->getMessage()));
+        $downloaded = $downloader->download([$download]);
+        if (\PEAR::isError($downloaded)) {
+            throw new \sfPluginException(sprintf('Problem when downloading "%s": %s', $download, $downloaded->getMessage()));
         }
         $errors = $downloader->getErrorMsgs();
         if (count($errors)) {
-            $err = array();
+            $err = [];
             foreach ($errors as $error) {
                 $err[] = $error;
             }
 
             if (!count($downloaded)) {
-                throw new sfPluginException(sprintf('Plugin "%s" installation failed: %s', $plugin, implode("\n", $err)));
+                throw new \sfPluginException(sprintf('Plugin "%s" installation failed: %s', $plugin, implode("\n", $err)));
             }
         }
 
         $pluginPackage = $downloaded[0];
 
-        $installer = new PEAR_Installer($this);
-        $installer->setOptions(array('upgrade' => true));
-        $packages = array($pluginPackage);
+        $installer = new \PEAR_Installer($this);
+        $installer->setOptions(['upgrade' => true]);
+        $packages = [$pluginPackage];
         $installer->sortPackagesForInstall($packages);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
+        \PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         $err = $installer->setDownloadedPackages($packages);
-        if (PEAR::isError($err)) {
-            PEAR::staticPopErrorHandling();
+        if (\PEAR::isError($err)) {
+            \PEAR::staticPopErrorHandling();
 
-            throw new sfPluginException($err->getMessage());
+            throw new \sfPluginException($err->getMessage());
         }
 
-        $info = $installer->install($pluginPackage, array('upgrade' => true));
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($info)) {
-            throw new sfPluginException(sprintf('Installation of "%s" plugin failed: %s', $plugin, $info->getMessage()));
+        $info = $installer->install($pluginPackage, ['upgrade' => true]);
+        \PEAR::staticPopErrorHandling();
+        if (\PEAR::isError($info)) {
+            throw new \sfPluginException(sprintf('Installation of "%s" plugin failed: %s', $plugin, $info->getMessage()));
         }
 
         if (is_array($info)) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Installation successful for plugin "%s"', $plugin))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Installation successful for plugin "%s"', $plugin)]));
 
-            $this->dispatcher->notify(new sfEvent($this, 'plugin.post_install', array('channel' => $channel, 'plugin' => $pluginPackage->getPackage())));
+            $this->dispatcher->notify(new \sfEvent($this, 'plugin.post_install', ['channel' => $channel, 'plugin' => $pluginPackage->getPackage()]));
 
             unset($this->installing[$channel.'/'.$plugin]);
 
             return $pluginPackage->getPackage();
         }
 
-        throw new sfPluginException(sprintf('Installation of "%s" plugin failed', $plugin));
+        throw new \sfPluginException(sprintf('Installation of "%s" plugin failed', $plugin));
     }
 
     /**
@@ -430,12 +431,12 @@ protected function isPluginCompatibleWithDependency($dependency)
      */
     protected function checkDependency($dependency)
     {
-        $dependencyChecker = new PEAR_Dependency2($this->environment->getConfig(), array(), array('package' => '', 'channel' => ''));
+        $dependencyChecker = new \PEAR_Dependency2($this->environment->getConfig(), [], ['package' => '', 'channel' => '']);
 
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $e = $dependencyChecker->validatePackageDependency($dependency, true, array());
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($e)) {
+        \PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
+        $e = $dependencyChecker->validatePackageDependency($dependency, true, []);
+        \PEAR::staticPopErrorHandling();
+        if (\PEAR::isError($e)) {
             return false;
         }
 
diff --git a/lib/plugin/sfPluginRecursiveDependencyException.class.php b/lib/plugin/sfPluginRecursiveDependencyException.class.php
index b4171d0ff..15b4b0f1f 100644
--- a/lib/plugin/sfPluginRecursiveDependencyException.class.php
+++ b/lib/plugin/sfPluginRecursiveDependencyException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginRecursiveDependencyException extends sfPluginException
+class sfPluginRecursiveDependencyException extends \sfPluginException
 {
 }
diff --git a/lib/plugin/sfPluginRestException.class.php b/lib/plugin/sfPluginRestException.class.php
index 92d9dcdc7..b26ce657a 100644
--- a/lib/plugin/sfPluginRestException.class.php
+++ b/lib/plugin/sfPluginRestException.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginRestException extends sfPluginException
+class sfPluginRestException extends \sfPluginException
 {
 }
diff --git a/lib/plugin/sfSymfonyPluginManager.class.php b/lib/plugin/sfSymfonyPluginManager.class.php
index c8cfcf0ec..ae1dfcf61 100644
--- a/lib/plugin/sfSymfonyPluginManager.class.php
+++ b/lib/plugin/sfSymfonyPluginManager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfSymfonyPluginManager extends sfPluginManager
+class sfSymfonyPluginManager extends \sfPluginManager
 {
     /**
      * Initializes this sfPluginManager instance.
@@ -26,15 +27,15 @@ class sfSymfonyPluginManager extends sfPluginManager
      *
      * See sfPluginManager for other options.
      *
-     * @param sfEventDispatcher $dispatcher  An event dispatcher instance
-     * @param sfPearEnvironment $environment A sfPearEnvironment instance
+     * @param \sfEventDispatcher $dispatcher  An event dispatcher instance
+     * @param \sfPearEnvironment $environment A sfPearEnvironment instance
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfPearEnvironment $environment)
+    public function initialize(\sfEventDispatcher $dispatcher, \sfPearEnvironment $environment)
     {
         parent::initialize($dispatcher, $environment);
 
         if (!$environment->getOption('web_dir')) {
-            throw new sfPluginException('You must provide a "web_dir" option.');
+            throw new \sfPluginException('You must provide a "web_dir" option.');
         }
     }
 
@@ -53,8 +54,8 @@ public function configure()
         $this->registerSymfonyPackage();
 
         // register callbacks to manage web content
-        $this->dispatcher->connect('plugin.post_install', array($this, 'listenToPluginPostInstall'));
-        $this->dispatcher->connect('plugin.post_uninstall', array($this, 'listenToPluginPostUninstall'));
+        $this->dispatcher->connect('plugin.post_install', [$this, 'listenToPluginPostInstall']);
+        $this->dispatcher->connect('plugin.post_uninstall', [$this, 'listenToPluginPostUninstall']);
     }
 
     /**
@@ -66,9 +67,9 @@ public function installWebContent($plugin, $sourceDirectory)
     {
         $webDir = $sourceDirectory.DIRECTORY_SEPARATOR.$plugin.DIRECTORY_SEPARATOR.'web';
         if (is_dir($webDir)) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Installing web data for plugin')));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Installing web data for plugin']));
 
-            $filesystem = new sfFilesystem();
+            $filesystem = new \sfFilesystem();
             $filesystem->relativeSymlink($webDir, $this->environment->getOption('web_dir').DIRECTORY_SEPARATOR.$plugin, true);
         }
     }
@@ -82,14 +83,14 @@ public function uninstallWebContent($plugin)
     {
         $targetDir = $this->environment->getOption('web_dir').DIRECTORY_SEPARATOR.$plugin;
         if (is_dir($targetDir)) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Uninstalling web data for plugin')));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Uninstalling web data for plugin']));
 
-            $filesystem = new sfFilesystem();
+            $filesystem = new \sfFilesystem();
 
             if (is_link($targetDir)) {
                 $filesystem->remove($targetDir);
             } else {
-                $filesystem->remove(sfFinder::type('any')->in($targetDir));
+                $filesystem->remove(\sfFinder::type('any')->in($targetDir));
                 $filesystem->remove($targetDir);
             }
         }
@@ -107,10 +108,10 @@ public function uninstallWebContent($plugin)
     public static function enablePlugin($plugin, $configDir)
     {
         if (!$configDir) {
-            throw new sfPluginException('You must provide a "config_dir" option.');
+            throw new \sfPluginException('You must provide a "config_dir" option.');
         }
 
-        $manipulator = sfClassManipulator::fromFile($configDir.'/ProjectConfiguration.class.php');
+        $manipulator = \sfClassManipulator::fromFile($configDir.'/ProjectConfiguration.class.php');
         $manipulator->wrapMethod('setup', '', sprintf('$this->enablePlugins(\'%s\');', $plugin));
         $manipulator->save();
     }
@@ -127,7 +128,7 @@ public static function enablePlugin($plugin, $configDir)
     public static function disablePlugin($plugin, $configDir)
     {
         if (!$configDir) {
-            throw new sfPluginException('You must provide a "config_dir" option.');
+            throw new \sfPluginException('You must provide a "config_dir" option.');
         }
 
         $file = $configDir.'/ProjectConfiguration.class.php';
@@ -145,7 +146,7 @@ public static function disablePlugin($plugin, $configDir)
     /**
      * Listens to the plugin.post_install event.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
     public function listenToPluginPostInstall($event)
     {
@@ -157,7 +158,7 @@ public function listenToPluginPostInstall($event)
     /**
      * Listens to the plugin.post_uninstall event.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
     public function listenToPluginPostUninstall($event)
     {
@@ -171,15 +172,15 @@ public function listenToPluginPostUninstall($event)
      */
     protected function registerSymfonyPackage()
     {
-        $symfony = new PEAR_PackageFile_v2_rw();
+        $symfony = new \PEAR_PackageFile_v2_rw();
         $symfony->setPackage('symfony');
         $symfony->setChannel('pear.symfony-project.com');
         $symfony->setConfig($this->environment->getConfig());
         $symfony->setPackageType('php');
         $symfony->setAPIVersion(preg_replace('/\d+(\-\w+)?$/', '0', SYMFONY_VERSION));
-        $symfony->setAPIStability(false === strpos(SYMFONY_VERSION, 'DEV') ? 'stable' : 'beta');
+        $symfony->setAPIStability(!str_contains(SYMFONY_VERSION, 'DEV') ? 'stable' : 'beta');
         $symfony->setReleaseVersion(preg_replace('/\-\w+$/', '', SYMFONY_VERSION));
-        $symfony->setReleaseStability(false === strpos(SYMFONY_VERSION, 'DEV') ? 'stable' : 'beta');
+        $symfony->setReleaseStability(!str_contains(SYMFONY_VERSION, 'DEV') ? 'stable' : 'beta');
         $symfony->setDate(date('Y-m-d'));
         $symfony->setDescription('symfony');
         $symfony->setSummary('symfony');
@@ -193,7 +194,7 @@ protected function registerSymfonyPackage()
 
         $this->environment->getRegistry()->deletePackage('symfony', 'pear.symfony-project.com');
         if (!$this->environment->getRegistry()->addPackage2($symfony)) {
-            throw new sfPluginException('Unable to register the symfony package');
+            throw new \sfPluginException('Unable to register the symfony package');
         }
     }
 
diff --git a/lib/plugins/sfDoctrinePlugin/config/installer.php b/lib/plugins/sfDoctrinePlugin/config/installer.php
index 52773c97b..efa27baf8 100644
--- a/lib/plugins/sfDoctrinePlugin/config/installer.php
+++ b/lib/plugins/sfDoctrinePlugin/config/installer.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $this->installDir(dirname(__FILE__).'/skeleton');
 $this->enablePlugin('sfDoctrinePlugin');
 $this->reloadTasks();
diff --git a/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
index 93fca6719..dc87256f6 100755
--- a/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,45 +16,45 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrinePluginConfiguration extends sfPluginConfiguration
+class sfDoctrinePluginConfiguration extends \sfPluginConfiguration
 {
     /**
-     * @see sfPluginConfiguration
+     * @see \sfPluginConfiguration
      */
     public function initialize()
     {
-        sfConfig::set('sf_orm', 'doctrine');
+        \sfConfig::set('sf_orm', 'doctrine');
 
-        if (!sfConfig::get('sf_admin_module_web_dir')) {
-            sfConfig::set('sf_admin_module_web_dir', '/sfDoctrinePlugin');
+        if (!\sfConfig::get('sf_admin_module_web_dir')) {
+            \sfConfig::set('sf_admin_module_web_dir', '/sfDoctrinePlugin');
         }
 
-        if (sfConfig::get('sf_web_debug')) {
+        if (\sfConfig::get('sf_web_debug')) {
             require_once dirname(__FILE__).'/../lib/debug/sfWebDebugPanelDoctrine.class.php';
 
-            $this->dispatcher->connect('debug.web.load_panels', array('sfWebDebugPanelDoctrine', 'listenToAddPanelEvent'));
+            $this->dispatcher->connect('debug.web.load_panels', ['sfWebDebugPanelDoctrine', 'listenToAddPanelEvent']);
         }
 
         if (!class_exists('Doctrine_Core')) {
-            require_once sfConfig::get('sf_doctrine_dir', realpath(dirname(__FILE__).'/../lib/vendor/doctrine/lib')).'/Doctrine/Core.php';
-            spl_autoload_register(array('Doctrine_Core', 'autoload'));
+            require_once \sfConfig::get('sf_doctrine_dir', realpath(dirname(__FILE__).'/../lib/vendor/doctrine/lib')).'/Doctrine/Core.php';
+            spl_autoload_register(['Doctrine_Core', 'autoload']);
         }
 
-        $manager = Doctrine_Manager::getInstance();
-        $manager->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL);
-        $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
-        $manager->setAttribute(Doctrine_Core::ATTR_RECURSIVE_MERGE_FIXTURES, true);
-        $manager->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
-        $manager->setAttribute(Doctrine_Core::ATTR_AUTOLOAD_TABLE_CLASSES, true);
+        $manager = \Doctrine_Manager::getInstance();
+        $manager->setAttribute(\Doctrine_Core::ATTR_EXPORT, \Doctrine_Core::EXPORT_ALL);
+        $manager->setAttribute(\Doctrine_Core::ATTR_VALIDATE, \Doctrine_Core::VALIDATE_NONE);
+        $manager->setAttribute(\Doctrine_Core::ATTR_RECURSIVE_MERGE_FIXTURES, true);
+        $manager->setAttribute(\Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
+        $manager->setAttribute(\Doctrine_Core::ATTR_AUTOLOAD_TABLE_CLASSES, true);
 
         // apply default attributes
         $manager->setDefaultAttributes();
 
         // configure doctrine through the dispatcher
-        $this->dispatcher->notify(new sfEvent($manager, 'doctrine.configure'));
+        $this->dispatcher->notify(new \sfEvent($manager, 'doctrine.configure'));
 
         // make sure the culture is intercepted
-        $this->dispatcher->connect('user.change_culture', array('sfDoctrineRecord', 'listenToChangeCultureEvent'));
+        $this->dispatcher->connect('user.change_culture', ['sfDoctrineRecord', 'listenToChangeCultureEvent']);
     }
 
     /**
@@ -63,18 +64,18 @@ public function initialize()
      */
     public function getModelBuilderOptions()
     {
-        $options = array(
+        $options = [
             'generateBaseClasses' => true,
             'generateTableClasses' => true,
             'packagesPrefix' => 'Plugin',
             'suffix' => '.class.php',
             'baseClassesDirectory' => 'base',
             'baseClassName' => 'sfDoctrineRecord',
-        );
+        ];
 
         // filter options through the dispatcher
         return $this->dispatcher
-            ->filter(new sfEvent($this, 'doctrine.filter_model_builder_options'), $options)
+            ->filter(new \sfEvent($this, 'doctrine.filter_model_builder_options'), $options)
             ->getReturnValue()
         ;
     }
@@ -86,15 +87,15 @@ public function getModelBuilderOptions()
      */
     public function getCliConfig()
     {
-        $config = array(
-            'data_fixtures_path' => array_merge(array(sfConfig::get('sf_data_dir').'/fixtures'), $this->configuration->getPluginSubPaths('/data/fixtures')),
-            'models_path' => sfConfig::get('sf_lib_dir').'/model/doctrine',
-            'migrations_path' => sfConfig::get('sf_lib_dir').'/migration/doctrine',
-            'sql_path' => sfConfig::get('sf_data_dir').'/sql',
-            'yaml_schema_path' => sfConfig::get('sf_config_dir').'/doctrine',
-        );
+        $config = [
+            'data_fixtures_path' => array_merge([\sfConfig::get('sf_data_dir').'/fixtures'], $this->configuration->getPluginSubPaths('/data/fixtures')),
+            'models_path' => \sfConfig::get('sf_lib_dir').'/model/doctrine',
+            'migrations_path' => \sfConfig::get('sf_lib_dir').'/migration/doctrine',
+            'sql_path' => \sfConfig::get('sf_data_dir').'/sql',
+            'yaml_schema_path' => \sfConfig::get('sf_config_dir').'/doctrine',
+        ];
 
         // filter config through the dispatcher
-        return $this->dispatcher->filter(new sfEvent($this, 'doctrine.filter_cli_config'), $config)->getReturnValue();
+        return $this->dispatcher->filter(new \sfEvent($this, 'doctrine.filter_cli_config'), $config)->getReturnValue();
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php b/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
index 0bc9d1400..249b4bda6 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineCli extends Doctrine_Cli
+class sfDoctrineCli extends \Doctrine_Cli
 {
     protected $symfonyDispatcher;
     protected $symfonyFormatter;
@@ -52,17 +52,17 @@ public function setSymfonyFormatter($formatter)
      */
     public function notify($notification = null, $style = 'HEADER')
     {
-        $this->symfonyDispatcher->notify(new sfEvent($this, 'command.log', array($this->symfonyFormatter->formatSection('doctrine', $notification))));
+        $this->symfonyDispatcher->notify(new \sfEvent($this, 'command.log', [$this->symfonyFormatter->formatSection('doctrine', $notification)]));
     }
 
     /**
      * Notify symfony of an exception thrown by the Doctrine cli.
      *
-     * @param Doctrine_Exception $exception
+     * @param \Doctrine_Exception $exception
      *
-     * @throws sfException
+     * @throws \sfException
      */
-    public function notifyException(Exception $exception)
+    public function notifyException(\Exception $exception)
     {
         throw $exception;
     }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
index 95604f3b1..339e1cef0 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineConnectionListener extends Doctrine_EventListener
+class sfDoctrineConnectionListener extends \Doctrine_EventListener
 {
     protected $connection;
     protected $encoding;
@@ -28,7 +28,7 @@ public function __construct($connection, $encoding)
         $this->encoding = $encoding;
     }
 
-    public function postConnect(Doctrine_Event $event)
+    public function postConnect(\Doctrine_Event $event)
     {
         $this->connection->setCharset($this->encoding);
         $this->connection->setDateFormat();
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
index d70e7b559..96fea39a5 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Connection profiler.
  *
@@ -7,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineConnectionProfiler extends Doctrine_Connection_Profiler
+class sfDoctrineConnectionProfiler extends \Doctrine_Connection_Profiler
 {
     protected $dispatcher;
-    protected $options = array();
+    protected $options = [];
 
     /**
      * Constructor.
@@ -22,13 +31,13 @@ class sfDoctrineConnectionProfiler extends Doctrine_Connection_Profiler
      *
      * @param array $options
      */
-    public function __construct(sfEventDispatcher $dispatcher, $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->dispatcher = $dispatcher;
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'logging' => false,
             'slow_query_threshold' => 1,
-        ), $options);
+        ], $options);
     }
 
     /**
@@ -54,13 +63,13 @@ public function setOption($name, $value)
     /**
      * Logs time and a connection query on behalf of the connection.
      */
-    public function preQuery(Doctrine_Event $event)
+    public function preQuery(\Doctrine_Event $event)
     {
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($event->getInvoker(), 'application.log', array(sprintf('query : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams()))))));
+            $this->dispatcher->notify(new \sfEvent($event->getInvoker(), 'application.log', [sprintf('query : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams())))]));
         }
 
-        sfTimerManager::getTimer('Database (Doctrine)');
+        \sfTimerManager::getTimer('Database (Doctrine)');
 
         $args = func_get_args();
         $this->__call(__FUNCTION__, $args);
@@ -69,9 +78,9 @@ public function preQuery(Doctrine_Event $event)
     /**
      * Logs to the timer.
      */
-    public function postQuery(Doctrine_Event $event)
+    public function postQuery(\Doctrine_Event $event)
     {
-        sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+        \sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
         $args = func_get_args();
         $this->__call(__FUNCTION__, $args);
@@ -84,13 +93,13 @@ public function postQuery(Doctrine_Event $event)
     /**
      * Logs a connection exec on behalf of the connection.
      */
-    public function preExec(Doctrine_Event $event)
+    public function preExec(\Doctrine_Event $event)
     {
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($event->getInvoker(), 'application.log', array(sprintf('exec : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams()))))));
+            $this->dispatcher->notify(new \sfEvent($event->getInvoker(), 'application.log', [sprintf('exec : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams())))]));
         }
 
-        sfTimerManager::getTimer('Database (Doctrine)');
+        \sfTimerManager::getTimer('Database (Doctrine)');
 
         $args = func_get_args();
         $this->__call(__FUNCTION__, $args);
@@ -99,9 +108,9 @@ public function preExec(Doctrine_Event $event)
     /**
      * Logs to the timer.
      */
-    public function postExec(Doctrine_Event $event)
+    public function postExec(\Doctrine_Event $event)
     {
-        sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+        \sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
         $args = func_get_args();
         $this->__call(__FUNCTION__, $args);
@@ -114,13 +123,13 @@ public function postExec(Doctrine_Event $event)
     /**
      * Logs a statement execute on behalf of the statement.
      */
-    public function preStmtExecute(Doctrine_Event $event)
+    public function preStmtExecute(\Doctrine_Event $event)
     {
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($event->getInvoker(), 'application.log', array(sprintf('execute : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams()))))));
+            $this->dispatcher->notify(new \sfEvent($event->getInvoker(), 'application.log', [sprintf('execute : %s - (%s)', $event->getQuery(), join(', ', self::fixParams($event->getParams())))]));
         }
 
-        sfTimerManager::getTimer('Database (Doctrine)');
+        \sfTimerManager::getTimer('Database (Doctrine)');
 
         $args = func_get_args();
         $this->__call(__FUNCTION__, $args);
@@ -129,9 +138,9 @@ public function preStmtExecute(Doctrine_Event $event)
     /**
      * Logs to the timer.
      */
-    public function postStmtExecute(Doctrine_Event $event)
+    public function postStmtExecute(\Doctrine_Event $event)
     {
-        sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
+        \sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
         $args = func_get_args();
         $this->__call(__FUNCTION__, $args);
@@ -148,9 +157,9 @@ public function postStmtExecute(Doctrine_Event $event)
      */
     public function getQueryExecutionEvents()
     {
-        $events = array();
+        $events = [];
         foreach ($this as $event) {
-            if (in_array($event->getCode(), array(Doctrine_Event::CONN_QUERY, Doctrine_Event::CONN_EXEC, Doctrine_Event::STMT_EXECUTE))) {
+            if (in_array($event->getCode(), [\Doctrine_Event::CONN_QUERY, \Doctrine_Event::CONN_EXEC, \Doctrine_Event::STMT_EXECUTE])) {
                 $events[] = $event;
             }
         }
@@ -168,7 +177,7 @@ public function getQueryExecutionEvents()
     public static function fixParams($params)
     {
         if (!is_array($params)) {
-            return array();
+            return [];
         }
 
         foreach ($params as $key => $param) {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
index e62d37c4e..6c1ce1d10 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,18 +17,18 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineDatabase extends sfDatabase
+class sfDoctrineDatabase extends \sfDatabase
 {
     /**
      * Instance of the Doctrine_Connection for this instance of sfDoctrineDatabase.
      * Connection can be accessed by the getDoctrineConnection() accessor method.
      *
-     * @var Doctrine_Connection
+     * @var \Doctrine_Connection
      */
     protected $_doctrineConnection;
 
     /**
-     * @var sfDoctrineConnectionProfiler
+     * @var \sfDoctrineConnectionProfiler
      */
     protected $profiler;
 
@@ -45,7 +45,7 @@ class sfDoctrineDatabase extends sfDatabase
      *
      * @param array $parameters Array of parameters used to initialize the database connection
      */
-    public function initialize($parameters = array())
+    public function initialize($parameters = [])
     {
         parent::initialize($parameters);
 
@@ -58,17 +58,17 @@ public function initialize($parameters = array())
 
         // Make sure we pass non-PEAR style DSNs as an array
         if (!strpos($dsn, '://')) {
-            $dsn = array($dsn, $this->getParameter('username'), $this->getParameter('password'));
+            $dsn = [$dsn, $this->getParameter('username'), $this->getParameter('password')];
         }
 
         // Make the Doctrine connection for $dsn and $name
-        $configuration = sfProjectConfiguration::getActive();
+        $configuration = \sfProjectConfiguration::getActive();
         $dispatcher = $configuration->getEventDispatcher();
-        $manager = Doctrine_Manager::getInstance();
+        $manager = \Doctrine_Manager::getInstance();
 
         $this->_doctrineConnection = $manager->openConnection($dsn, $name);
 
-        $attributes = $this->getParameter('attributes', array());
+        $attributes = $this->getParameter('attributes', []);
         foreach ($attributes as $name => $value) {
             if (is_string($name)) {
                 $stringName = $name;
@@ -84,24 +84,24 @@ public function initialize($parameters = array())
         }
 
         $encoding = $this->getParameter('encoding', 'UTF8');
-        $eventListener = new sfDoctrineConnectionListener($this->_doctrineConnection, $encoding);
+        $eventListener = new \sfDoctrineConnectionListener($this->_doctrineConnection, $encoding);
         $this->_doctrineConnection->addListener($eventListener);
 
         // Load Query Profiler
-        if ($this->getParameter('profiler', sfConfig::get('sf_debug'))) {
-            $this->profiler = new sfDoctrineConnectionProfiler($dispatcher, array(
-                'logging' => $this->getParameter('logging', sfConfig::get('sf_logging_enabled')),
-            ));
+        if ($this->getParameter('profiler', \sfConfig::get('sf_debug'))) {
+            $this->profiler = new \sfDoctrineConnectionProfiler($dispatcher, [
+                'logging' => $this->getParameter('logging', \sfConfig::get('sf_logging_enabled')),
+            ]);
             $this->_doctrineConnection->addListener($this->profiler, 'symfony_profiler');
         }
 
-        $dispatcher->notify(new sfEvent($manager, 'doctrine.configure_connection', array('connection' => $this->_doctrineConnection, 'database' => $this)));
+        $dispatcher->notify(new \sfEvent($manager, 'doctrine.configure_connection', ['connection' => $this->_doctrineConnection, 'database' => $this]));
     }
 
     /**
      * Get the Doctrine_Connection instance.
      *
-     * @return Doctrine_Connection $conn
+     * @return \Doctrine_Connection $conn
      */
     public function getDoctrineConnection()
     {
@@ -111,7 +111,7 @@ public function getDoctrineConnection()
     /**
      * Returns the connection profiler.
      *
-     * @return sfDoctrineConnectionProfiler|null
+     * @return \sfDoctrineConnectionProfiler|null
      */
     public function getProfiler()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
index 9b1387a04..28c576c3f 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebDebugPanelDoctrine extends sfWebDebugPanel
+class sfWebDebugPanelDoctrine extends \sfWebDebugPanel
 {
     /**
      * Get the title/icon for the panel.
@@ -50,7 +50,7 @@ public function getPanelContent()
     {
         return '
       <div id="sfWebDebugDatabaseLogs">
-        <h3>Doctrine Version: '.Doctrine_Core::VERSION.'</h3>
+        <h3>Doctrine Version: '.\Doctrine_Core::VERSION.'</h3>
         <ol>'.implode("\n", $this->getSqlLogs()).'</ol>
       </div>
     ';
@@ -59,7 +59,7 @@ public function getPanelContent()
     /**
      * Listens to debug.web.load_panels and adds this panel.
      */
-    public static function listenToAddPanelEvent(sfEvent $event)
+    public static function listenToAddPanelEvent(\sfEvent $event)
     {
         $event->getSubject()->setPanel('db', new self($event->getSubject()));
     }
@@ -71,13 +71,13 @@ public static function listenToAddPanelEvent(sfEvent $event)
      */
     protected function getDoctrineEvents()
     {
-        $databaseManager = sfContext::getInstance()->getDatabaseManager();
+        $databaseManager = \sfContext::getInstance()->getDatabaseManager();
 
-        $events = array();
+        $events = [];
         if ($databaseManager) {
             foreach ($databaseManager->getNames() as $name) {
                 $database = $databaseManager->getDatabase($name);
-                if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler()) {
+                if ($database instanceof \sfDoctrineDatabase && $profiler = $database->getProfiler()) {
                     foreach ($profiler->getQueryExecutionEvents() as $event) {
                         $events[$event->getSequence()] = $event;
                     }
@@ -100,21 +100,21 @@ protected function getSqlLogs()
     {
         $logs = $this->webDebug->getLogger()->getLogs();
 
-        $html = array();
+        $html = [];
         foreach ($this->getDoctrineEvents() as $i => $event) {
-            $conn = $event->getInvoker() instanceof Doctrine_Connection ? $event->getInvoker() : $event->getInvoker()->getConnection();
-            $params = sfDoctrineConnectionProfiler::fixParams($event->getParams());
-            $query = $this->formatSql(htmlspecialchars($event->getQuery(), ENT_QUOTES, sfConfig::get('sf_charset')));
+            $conn = $event->getInvoker() instanceof \Doctrine_Connection ? $event->getInvoker() : $event->getInvoker()->getConnection();
+            $params = \sfDoctrineConnectionProfiler::fixParams($event->getParams());
+            $query = $this->formatSql(htmlspecialchars($event->getQuery(), ENT_QUOTES, \sfConfig::get('sf_charset')));
 
             // interpolate parameters
             foreach ($params as $param) {
-                $param = htmlspecialchars((string) $param, ENT_QUOTES, sfConfig::get('sf_charset'));
+                $param = htmlspecialchars((string) $param, ENT_QUOTES, \sfConfig::get('sf_charset'));
                 $query = join(var_export(is_scalar($param) ? $param : (string) $param, true), explode('?', $query, 2));
             }
 
             // slow query
-            if ($event->slowQuery && $this->getStatus() > sfLogger::NOTICE) {
-                $this->setStatus(sfLogger::NOTICE);
+            if ($event->slowQuery && $this->getStatus() > \sfLogger::NOTICE) {
+                $this->setStatus(\sfLogger::NOTICE);
             }
 
             // backtrace
@@ -125,7 +125,7 @@ protected function getSqlLogs()
                     break;
                 }
 
-                if (false !== strpos($log['message'], $event->getQuery())) {
+                if (str_contains($log['message'], $event->getQuery())) {
                     // assume queries are being requested in order
                     unset($logs[$i]);
                     $backtrace = '&nbsp;'.$this->getToggleableDebugStack($log['debug_backtrace']);
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
index fa23f6c0f..678197c1a 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfFormDoctrine extends sfFormObject
+abstract class sfFormDoctrine extends \sfFormObject
 {
     /**
      * Constructor.
@@ -28,37 +28,37 @@ abstract class sfFormDoctrine extends sfFormObject
      * @param array  $options    An array of options
      * @param string $CSRFSecret A CSRF secret (false to disable CSRF protection, null to use the global CSRF secret)
      *
-     * @throws sfException
+     * @throws \sfException
      *
-     * @see sfForm
+     * @see \sfForm
      */
-    public function __construct($object = null, $options = array(), $CSRFSecret = null)
+    public function __construct($object = null, $options = [], $CSRFSecret = null)
     {
         $class = $this->getModelName();
         if (!$object) {
             $this->object = new $class();
         } else {
             if (!$object instanceof $class) {
-                throw new sfException(sprintf('The "%s" form only accepts a "%s" object.', get_class($this), $class));
+                throw new \sfException(sprintf('The "%s" form only accepts a "%s" object.', get_class($this), $class));
             }
 
             $this->object = $object;
             $this->isNew = !$this->getObject()->exists();
         }
 
-        parent::__construct(array(), $options, $CSRFSecret);
+        parent::__construct([], $options, $CSRFSecret);
 
         $this->updateDefaultsFromObject();
     }
 
     /**
-     * @return Doctrine_Connection
+     * @return \Doctrine_Connection
      *
-     * @see sfFormObject
+     * @see \sfFormObject
      */
     public function getConnection()
     {
-        return Doctrine_Manager::getInstance()->getConnectionForComponent($this->getModelName());
+        return \Doctrine_Manager::getInstance()->getConnectionForComponent($this->getModelName());
     }
 
     /**
@@ -67,12 +67,12 @@ public function getConnection()
      * @param array  $cultures  An array of cultures
      * @param string $decorator A HTML decorator for the embedded form
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function embedI18n($cultures, $decorator = null)
     {
         if (!$this->isI18n()) {
-            throw new sfException(sprintf('The model "%s" is not internationalized.', $this->getModelName()));
+            throw new \sfException(sprintf('The model "%s" is not internationalized.', $this->getModelName()));
         }
 
         $class = $this->getI18nFormClass();
@@ -101,9 +101,9 @@ public function embedI18n($cultures, $decorator = null)
      * @param string $innerDecorator A HTML decorator for each embedded form
      * @param string $decorator      A HTML decorator for the main embedded form
      *
-     * @throws InvalidArgumentException If the relationship is not a collection
+     * @throws \InvalidArgumentException If the relationship is not a collection
      */
-    public function embedRelation($relationName, $formClass = null, $formArgs = array(), $innerDecorator = null, $decorator = null)
+    public function embedRelation($relationName, $formClass = null, $formArgs = [], $innerDecorator = null, $decorator = null)
     {
         if (false !== $pos = stripos($relationName, ' as ')) {
             $fieldName = substr($relationName, $pos + 4);
@@ -114,15 +114,15 @@ public function embedRelation($relationName, $formClass = null, $formArgs = arra
 
         $relation = $this->getObject()->getTable()->getRelation($relationName);
 
-        $r = new ReflectionClass(null === $formClass ? $relation->getClass().'Form' : $formClass);
+        $r = new \ReflectionClass(null === $formClass ? $relation->getClass().'Form' : $formClass);
 
-        if (Doctrine_Relation::ONE == $relation->getType()) {
-            $this->embedForm($fieldName, $r->newInstanceArgs(array_merge(array($this->getObject()->{$relationName}), $formArgs)), $decorator);
+        if (\Doctrine_Relation::ONE == $relation->getType()) {
+            $this->embedForm($fieldName, $r->newInstanceArgs(array_merge([$this->getObject()->{$relationName}], $formArgs)), $decorator);
         } else {
-            $subForm = new sfForm();
+            $subForm = new \sfForm();
 
             foreach ($this->getObject()->{$relationName} as $index => $childObject) {
-                $form = $r->newInstanceArgs(array_merge(array($childObject), $formArgs));
+                $form = $r->newInstanceArgs(array_merge([$childObject], $formArgs));
 
                 $subForm->embedForm($index, $form, $innerDecorator);
                 $subForm->getWidgetSchema()->setLabel($index, (string) $childObject);
@@ -142,7 +142,7 @@ public function embedRelation($relationName, $formClass = null, $formArgs = arra
      * The method must return the processed value or false to remove the value
      * from the array of cleaned up values.
      *
-     * @see sfFormObject
+     * @see \sfFormObject
      *
      * @param array $values
      *
@@ -163,7 +163,7 @@ public function processValues($values)
                 }
             } else {
                 // save files
-                if ($this->validatorSchema[$field] instanceof sfValidatorFile) {
+                if ($this->validatorSchema[$field] instanceof \sfValidatorFile) {
                     $values[$field] = $this->processUploadedFile($field, null, $valuesToProcess);
                 }
             }
@@ -207,14 +207,14 @@ public function getI18nFormClass()
      *
      * @return string The primary key name of the i18n model
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function getI18nModelPrimaryKeyName()
     {
         $primaryKey = $this->getObject()->getTable()->getIdentifier();
 
         if (is_array($primaryKey)) {
-            throw new sfException(sprintf('The model "%s" has composite primary keys and cannot be used with i18n..', $this->getModelName()));
+            throw new \sfException(sprintf('The model "%s" has composite primary keys and cannot be used with i18n..', $this->getModelName()));
         }
 
         return $primaryKey;
@@ -231,7 +231,7 @@ public function getI18nModelI18nField()
     }
 
     /**
-     * @see sfFormObject
+     * @see \sfFormObject
      */
     protected function doUpdateObject($values)
     {
@@ -253,7 +253,7 @@ protected function updateDefaultsFromObject()
         }
 
         foreach ($this->embeddedForms as $name => $form) {
-            if ($form instanceof sfFormDoctrine) {
+            if ($form instanceof \sfFormDoctrine) {
                 $form->updateDefaultsFromObject();
                 $defaults[$name] = $form->getDefaults();
             }
@@ -273,8 +273,8 @@ protected function updateDefaultsFromObject()
      */
     protected function processUploadedFile($field, $filename = null, $values = null)
     {
-        if (!$this->validatorSchema[$field] instanceof sfValidatorFile) {
-            throw new LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
+        if (!$this->validatorSchema[$field] instanceof \sfValidatorFile) {
+            throw new \LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
         }
 
         if (null === $values) {
@@ -312,8 +312,8 @@ protected function processUploadedFile($field, $filename = null, $values = null)
      */
     protected function removeFile($field)
     {
-        if (!$this->validatorSchema[$field] instanceof sfValidatorFile) {
-            throw new LogicException(sprintf('You cannot remove the current file for field "%s" as the field is not a file.', $field));
+        if (!$this->validatorSchema[$field] instanceof \sfValidatorFile) {
+            throw new \LogicException(sprintf('You cannot remove the current file for field "%s" as the field is not a file.', $field));
         }
 
         $directory = $this->validatorSchema[$field]->getOption('path');
@@ -336,16 +336,16 @@ protected function removeFile($field)
     /**
      * Saves the current file for the field.
      *
-     * @param string          $field    The field name
-     * @param string          $filename The file name of the file to save
-     * @param sfValidatedFile $file     The validated file to save
+     * @param string           $field    The field name
+     * @param string           $filename The file name of the file to save
+     * @param \sfValidatedFile $file     The validated file to save
      *
      * @return string The filename used to save the file
      */
-    protected function saveFile($field, $filename = null, sfValidatedFile $file = null)
+    protected function saveFile($field, $filename = null, \sfValidatedFile $file = null)
     {
-        if (!$this->validatorSchema[$field] instanceof sfValidatorFile) {
-            throw new LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
+        if (!$this->validatorSchema[$field] instanceof \sfValidatorFile) {
+            throw new \LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
         }
 
         if (null === $file) {
@@ -381,14 +381,14 @@ protected function setupInheritance()
      *
      * @return string
      *
-     * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
+     * @throws \InvalidArgumentException If no relation with the supplied alias exists on the current model
      */
     protected function getRelatedModelName($alias)
     {
-        $table = Doctrine_Core::getTable($this->getModelName());
+        $table = \Doctrine_Core::getTable($this->getModelName());
 
         if (!$table->hasRelation($alias)) {
-            throw new InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
+            throw new \InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
         }
 
         $relation = $table->getRelation($alias);
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
index 07234f7a6..b0775b3f6 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,7 +22,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfFormFilterDoctrine extends sfFormFilter
+abstract class sfFormFilterDoctrine extends \sfFormFilter
 {
     /**
      * Returns the current model name.
@@ -64,7 +64,7 @@ public function setTableMethod($tableMethod)
     /**
      * Sets the query object to use.
      *
-     * @param Doctrine_Query $query
+     * @param \Doctrine_Query $query
      */
     public function setQuery($query)
     {
@@ -74,9 +74,9 @@ public function setQuery($query)
     /**
      * Returns a Doctrine Query based on the current values form the form.
      *
-     * @return Doctrine_Query A Doctrine Query object
+     * @return \Doctrine_Query A Doctrine Query object
      *
-     * @throws sfValidatorErrorSchema
+     * @throws \sfValidatorErrorSchema
      */
     public function getQuery()
     {
@@ -123,7 +123,7 @@ public function processValues($values)
      *
      * @param array $values An array of parameters to build the Query object
      *
-     * @return Doctrine_Query A Doctrine Query object
+     * @return \Doctrine_Query A Doctrine Query object
      */
     public function buildQuery(array $values)
     {
@@ -136,9 +136,9 @@ public function buildQuery(array $values)
      * Overload this method instead of {@link buildQuery()} to avoid running
      * {@link processValues()} multiple times.
      *
-     * @return Doctrine_Query
+     * @return \Doctrine_Query
      *
-     * @throws LogicException
+     * @throws \LogicException
      */
     protected function doBuildQuery(array $values)
     {
@@ -148,7 +148,7 @@ protected function doBuildQuery(array $values)
             $tmp = $this->getTable()->{$method}($query);
 
             // for backward compatibility
-            if ($tmp instanceof Doctrine_Query) {
+            if ($tmp instanceof \Doctrine_Query) {
                 $query = $tmp;
             }
         }
@@ -167,14 +167,14 @@ protected function doBuildQuery(array $values)
             if ($this->getTable()->hasField($field)) {
                 $method = sprintf('add%sColumnQuery', self::camelize($this->getFieldName($field)));
             } elseif (!method_exists($this, $method = sprintf('add%sColumnQuery', self::camelize($field))) && null !== $type) {
-                throw new LogicException(sprintf('You must define a "%s" method to be able to filter with the "%s" field.', $method, $field));
+                throw new \LogicException(sprintf('You must define a "%s" method to be able to filter with the "%s" field.', $method, $field));
             }
 
             if (method_exists($this, $method)) {
                 $this->{$method}($query, $field, $values[$field]);
             } elseif (null !== $type) {
                 if (!method_exists($this, $method = sprintf('add%sQuery', $type))) {
-                    throw new LogicException(sprintf('Unable to filter for the "%s" type.', $type));
+                    throw new \LogicException(sprintf('Unable to filter for the "%s" type.', $type));
                 }
 
                 $this->{$method}($query, $field, $values[$field]);
@@ -184,7 +184,7 @@ protected function doBuildQuery(array $values)
         return $query;
     }
 
-    protected function addForeignKeyQuery(Doctrine_Query $query, $field, $value)
+    protected function addForeignKeyQuery(\Doctrine_Query $query, $field, $value)
     {
         $fieldName = $this->getFieldName($field);
 
@@ -195,42 +195,42 @@ protected function addForeignKeyQuery(Doctrine_Query $query, $field, $value)
         }
     }
 
-    protected function addEnumQuery(Doctrine_Query $query, $field, $value)
+    protected function addEnumQuery(\Doctrine_Query $query, $field, $value)
     {
         $fieldName = $this->getFieldName($field);
 
         $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
     }
 
-    protected function addTextQuery(Doctrine_Query $query, $field, $values)
+    protected function addTextQuery(\Doctrine_Query $query, $field, $values)
     {
         $fieldName = $this->getFieldName($field);
 
         if (is_array($values) && isset($values['is_empty']) && $values['is_empty']) {
-            $query->addWhere(sprintf('(%s.%s IS NULL OR %1$s.%2$s = ?)', $query->getRootAlias(), $fieldName), array(''));
+            $query->addWhere(sprintf('(%s.%s IS NULL OR %1$s.%2$s = ?)', $query->getRootAlias(), $fieldName), ['']);
         } elseif (is_array($values) && isset($values['text']) && '' != $values['text']) {
             $query->addWhere(sprintf('%s.%s LIKE ?', $query->getRootAlias(), $fieldName), '%'.$values['text'].'%');
         }
     }
 
-    protected function addNumberQuery(Doctrine_Query $query, $field, $values)
+    protected function addNumberQuery(\Doctrine_Query $query, $field, $values)
     {
         $fieldName = $this->getFieldName($field);
 
         if (is_array($values) && isset($values['is_empty']) && $values['is_empty']) {
-            $query->addWhere(sprintf('(%s.%s IS NULL OR %1$s.%2$s = ?)', $query->getRootAlias(), $fieldName), array(''));
+            $query->addWhere(sprintf('(%s.%s IS NULL OR %1$s.%2$s = ?)', $query->getRootAlias(), $fieldName), ['']);
         } elseif (is_array($values) && isset($values['text']) && '' !== $values['text']) {
             $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $values['text']);
         }
     }
 
-    protected function addBooleanQuery(Doctrine_Query $query, $field, $value)
+    protected function addBooleanQuery(\Doctrine_Query $query, $field, $value)
     {
         $fieldName = $this->getFieldName($field);
         $query->addWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $fieldName), $value);
     }
 
-    protected function addDateQuery(Doctrine_Query $query, $field, $values)
+    protected function addDateQuery(\Doctrine_Query $query, $field, $values)
     {
         $fieldName = $this->getFieldName($field);
 
@@ -262,14 +262,14 @@ protected function setupInheritance()
      *
      * @return string
      *
-     * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
+     * @throws \InvalidArgumentException If no relation with the supplied alias exists on the current model
      */
     protected function getRelatedModelName($alias)
     {
-        $table = Doctrine_Core::getTable($this->getModelName());
+        $table = \Doctrine_Core::getTable($this->getModelName());
 
         if (!$table->hasRelation($alias)) {
-            throw new InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
+            throw new \InvalidArgumentException(sprintf('The "%s" model has no "%s" relation.', $this->getModelName(), $alias));
         }
 
         $relation = $table->getRelation($alias);
@@ -289,11 +289,11 @@ protected function getFieldName($colName)
 
     protected function camelize($text)
     {
-        return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+        return strtr(ucwords(strtr($text, ['/' => ':: ', '_' => ' ', '-' => ' '])), [' ' => '']);
     }
 
     protected function getTable()
     {
-        return Doctrine_Core::getTable($this->getModelName());
+        return \Doctrine_Core::getTable($this->getModelName());
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
index 1b0ca4e04..cf4456599 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +17,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineColumn implements ArrayAccess
+class sfDoctrineColumn implements \ArrayAccess
 {
     /**
      * Array mapping Doctrine column types to the native symfony type.
      */
-    public static $doctrineToSymfony = array(
+    public static $doctrineToSymfony = [
         'boolean' => 'BOOLEAN',
         'string' => 'LONGVARCHAR',
         'integer' => 'INTEGER',
@@ -37,7 +37,7 @@ class sfDoctrineColumn implements ArrayAccess
         'object' => 'LONGVARCHAR',
         'array' => 'LONGVARCHAR',
         'decimal' => 'DECIMAL',
-    );
+    ];
 
     /**
      * Store the name of the related class for this column if it is
@@ -58,7 +58,7 @@ class sfDoctrineColumn implements ArrayAccess
     /**
      * Doctrine_Table instance this column belongs to.
      *
-     * @var Doctrine_Table
+     * @var \Doctrine_Table
      */
     protected $table;
 
@@ -74,14 +74,14 @@ class sfDoctrineColumn implements ArrayAccess
      *
      * @var array
      */
-    protected $definition = array();
+    protected $definition = [];
 
     /**
      * Constructor.
      *
      * @param string $name
      */
-    public function __construct($name, Doctrine_Table $table)
+    public function __construct($name, \Doctrine_Table $table)
     {
         $this->name = $name;
         $this->table = $table;
@@ -187,7 +187,7 @@ public function getDefinitionKey($key)
      *
      * @param string $key
      *
-     * @return mixed|null
+     * @return \mixed|null
      */
     public function getRelationKey($key)
     {
@@ -252,7 +252,7 @@ public function isForeignKey()
             $local = array_map('strtolower', $local);
             if (in_array(strtolower($this->name), $local)) {
                 $this->foreignClassName = $relation['class'];
-                if (Doctrine_Relation::ONE === $relation->getType()) {
+                if (\Doctrine_Relation::ONE === $relation->getType()) {
                     $this->foreignFieldName = $relation['foreign'];
                 }
 
@@ -294,12 +294,12 @@ public function getForeignFieldName()
     /**
      * If foreign key get the related Doctrine_Table object.
      *
-     * @return Doctrine_Table $table
+     * @return \Doctrine_Table $table
      */
     public function getForeignTable()
     {
         if ($this->isForeignKey()) {
-            return Doctrine_Core::getTable($this->foreignClassName);
+            return \Doctrine_Core::getTable($this->foreignClassName);
         }
 
         return false;
@@ -308,7 +308,7 @@ public function getForeignTable()
     /**
      * Set the Doctrine_Table object this column belongs to.
      */
-    public function setTable(Doctrine_Table $table)
+    public function setTable(\Doctrine_Table $table)
     {
         $this->table = $table;
     }
@@ -316,7 +316,7 @@ public function setTable(Doctrine_Table $table)
     /**
      * Get the Doctrine_Table object this column belongs to.
      *
-     * @return Doctrine_Table $table
+     * @return \Doctrine_Table $table
      */
     public function getTable()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
index 3f296dac2..398486330 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,14 +18,14 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineFormFilterGenerator extends sfDoctrineFormGenerator
+class sfDoctrineFormFilterGenerator extends \sfDoctrineFormGenerator
 {
     /**
      * Initializes the current sfGenerator instance.
      *
-     * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
+     * @param \sfGeneratorManager $generatorManager A sfGeneratorManager instance
      */
-    public function initialize(sfGeneratorManager $generatorManager)
+    public function initialize(\sfGeneratorManager $generatorManager)
     {
         parent::initialize($generatorManager);
 
@@ -38,7 +39,7 @@ public function initialize(sfGeneratorManager $generatorManager)
      *
      * @return string The data to put in configuration cache
      */
-    public function generate($params = array())
+    public function generate($params = [])
     {
         $this->params = $params;
 
@@ -53,7 +54,7 @@ public function generate($params = array())
         $models = $this->loadModels();
 
         // create the project base class for all forms
-        $file = sfConfig::get('sf_lib_dir').'/filter/doctrine/BaseFormFilterDoctrine.class.php';
+        $file = \sfConfig::get('sf_lib_dir').'/filter/doctrine/BaseFormFilterDoctrine.class.php';
         if (!file_exists($file)) {
             if (!is_dir($directory = dirname($file))) {
                 mkdir($directory, 0777, true);
@@ -66,10 +67,10 @@ public function generate($params = array())
 
         // create a form class for every Doctrine class
         foreach ($models as $model) {
-            $this->table = Doctrine_Core::getTable($model);
+            $this->table = \Doctrine_Core::getTable($model);
             $this->modelName = $model;
 
-            $baseDir = sfConfig::get('sf_lib_dir').'/filter/doctrine';
+            $baseDir = \sfConfig::get('sf_lib_dir').'/filter/doctrine';
 
             $isPluginModel = $this->isPluginModel($model);
             if ($isPluginModel) {
@@ -105,7 +106,7 @@ public function generate($params = array())
     /**
      * Returns a sfWidgetForm class name for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The name of a subclass of sfWidgetForm
      */
@@ -143,15 +144,15 @@ public function getWidgetClassForColumn($column)
     /**
      * Returns a PHP string representing options to pass to a widget for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The options to pass to the widget as a PHP string
      */
     public function getWidgetOptionsForColumn($column)
     {
-        $options = array();
+        $options = [];
 
-        $withEmpty = $column->isNotNull() && !$column->isForeignKey() ? array("'with_empty' => false") : array();
+        $withEmpty = $column->isNotNull() && !$column->isForeignKey() ? ["'with_empty' => false"] : [];
 
         switch ($column->getDoctrineType()) {
             case 'boolean':
@@ -168,7 +169,7 @@ public function getWidgetOptionsForColumn($column)
                 break;
 
             case 'enum':
-                $values = array('' => '');
+                $values = ['' => ''];
                 $values = array_merge($values, $column['values']);
                 $values = array_combine($values, $values);
                 $options[] = "'choices' => ".$this->arrayExport($values);
@@ -189,7 +190,7 @@ public function getWidgetOptionsForColumn($column)
     /**
      * Returns a sfValidator class name for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The name of a subclass of sfValidator
      */
@@ -238,13 +239,13 @@ public function getValidatorClassForColumn($column)
     /**
      * Returns a PHP string representing options to pass to a validator for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The options to pass to the validator as a PHP string
      */
     public function getValidatorOptionsForColumn($column)
     {
-        $options = array('\'required\' => false');
+        $options = ['\'required\' => false'];
 
         if ($column->isForeignKey()) {
             $columns = $column->getForeignTable()->getColumns();
@@ -290,7 +291,7 @@ public function getValidatorForColumn($column)
     {
         $format = 'new %s(%s)';
 
-        if (in_array($class = $this->getValidatorClassForColumn($column), array('sfValidatorInteger', 'sfValidatorNumber'))) {
+        if (in_array($class = $this->getValidatorClassForColumn($column), ['sfValidatorInteger', 'sfValidatorNumber'])) {
             $format = 'new sfValidatorSchemaFilter(\'text\', new %s(%s))';
         }
 
@@ -360,7 +361,7 @@ protected function arrayExport($values)
     protected function filterModels($models)
     {
         foreach ($models as $key => $model) {
-            $table = Doctrine_Core::getTable($model);
+            $table = \Doctrine_Core::getTable($model);
             $symfonyOptions = (array) $table->getOption('symfony');
 
             if ($table->isGenerator()) {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
index c08db52cb..62f02e405 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,35 +19,35 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineFormGenerator extends sfGenerator
+class sfDoctrineFormGenerator extends \sfGenerator
 {
     /**
      * Array of all the loaded models.
      *
      * @var array
      */
-    public $models = array();
+    public $models = [];
 
     /**
      * Array of all plugin models.
      *
      * @var array
      */
-    public $pluginModels = array();
+    public $pluginModels = [];
 
     /**
      * Array of all configuration params.
      *
      * @var array
      */
-    public $params = array();
+    public $params = [];
 
     /**
      * Initializes the current sfGenerator instance.
      *
-     * @param sfGeneratorManager A sfGeneratorManager instance
+     * @param \sfGeneratorManager A sfGeneratorManager instance
      */
-    public function initialize(sfGeneratorManager $generatorManager)
+    public function initialize(\sfGeneratorManager $generatorManager)
     {
         parent::initialize($generatorManager);
 
@@ -62,7 +62,7 @@ public function initialize(sfGeneratorManager $generatorManager)
      *
      * @return string The data to put in configuration cache
      */
-    public function generate($params = array())
+    public function generate($params = [])
     {
         $this->params = $params;
 
@@ -77,7 +77,7 @@ public function generate($params = array())
         $models = $this->loadModels();
 
         // create the project base class for all forms
-        $file = sfConfig::get('sf_lib_dir').'/form/doctrine/BaseFormDoctrine.class.php';
+        $file = \sfConfig::get('sf_lib_dir').'/form/doctrine/BaseFormDoctrine.class.php';
         if (!file_exists($file)) {
             if (!is_dir($directory = dirname($file))) {
                 mkdir($directory, 0777, true);
@@ -90,10 +90,10 @@ public function generate($params = array())
 
         // create a form class for every Doctrine class
         foreach ($models as $model) {
-            $this->table = Doctrine_Core::getTable($model);
+            $this->table = \Doctrine_Core::getTable($model);
             $this->modelName = $model;
 
-            $baseDir = sfConfig::get('sf_lib_dir').'/form/doctrine';
+            $baseDir = \sfConfig::get('sf_lib_dir').'/form/doctrine';
 
             $isPluginModel = $this->isPluginModel($model);
             if ($isPluginModel) {
@@ -146,19 +146,19 @@ public function getPluginModels()
                     continue;
                 }
 
-                foreach (sfFinder::type('file')->name('*.php')->in($path.'/lib/model/doctrine') as $path) {
+                foreach (\sfFinder::type('file')->name('*.php')->in($path.'/lib/model/doctrine') as $path) {
                     $info = pathinfo($path);
                     $e = explode('.', $info['filename']);
                     $modelName = substr($e[0], 6, strlen($e[0]));
 
                     if (class_exists($e[0]) && class_exists($modelName)) {
-                        $parent = new ReflectionClass('Doctrine_Record');
-                        $reflection = new ReflectionClass($modelName);
+                        $parent = new \ReflectionClass('Doctrine_Record');
+                        $reflection = new \ReflectionClass($modelName);
                         if ($reflection->isSubclassOf($parent)) {
                             $this->pluginModels[$modelName] = $pluginName;
 
                             if ($reflection->isInstantiable()) {
-                                $generators = Doctrine_Core::getTable($modelName)->getGenerators();
+                                $generators = \Doctrine_Core::getTable($modelName)->getGenerators();
                                 foreach ($generators as $generator) {
                                     $this->pluginModels[$generator->getOption('className')] = $pluginName;
                                 }
@@ -207,12 +207,12 @@ public function getPluginNameForModel($modelName)
      */
     public function getManyToManyRelations()
     {
-        $relations = array();
+        $relations = [];
         foreach ($this->table->getRelations() as $relation) {
             if (
-                Doctrine_Relation::MANY == $relation->getType()
+                \Doctrine_Relation::MANY == $relation->getType()
                 && isset($relation['refTable'])
-                && (null === $this->getParentModel() || !Doctrine_Core::getTable($this->getParentModel())->hasRelation($relation->getAlias()))
+                && (null === $this->getParentModel() || !\Doctrine_Core::getTable($this->getParentModel())->hasRelation($relation->getAlias()))
             ) {
                 $relations[] = $relation;
             }
@@ -234,16 +234,16 @@ public function getManyToManyRelations()
      */
     public function getForeignKeyNames()
     {
-        $names = array();
+        $names = [];
         foreach ($this->table->getRelations() as $relation) {
-            if (Doctrine_Relation::ONE === $relation->getType()) {
+            if (\Doctrine_Relation::ONE === $relation->getType()) {
                 $foreignDef = $relation->getTable()->getDefinitionOf($relation->getForeignFieldName());
-                $names[] = array($relation['table']->getOption('name'), $relation->getForeignFieldName(), $this->isColumnNotNull($relation->getForeignFieldName(), $foreignDef), false);
+                $names[] = [$relation['table']->getOption('name'), $relation->getForeignFieldName(), $this->isColumnNotNull($relation->getForeignFieldName(), $foreignDef), false];
             }
         }
 
         foreach ($this->getManyToManyRelations() as $relation) {
-            $names[] = array($relation['table']->getOption('name'), $relation['alias'], false, true);
+            $names[] = [$relation['table']->getOption('name'), $relation['alias'], false, true];
         }
 
         return $names;
@@ -252,7 +252,7 @@ public function getForeignKeyNames()
     /**
      * Returns the first primary key column of the current table.
      *
-     * @param ColumnMap A ColumnMap object
+     * @param \ColumnMap A ColumnMap object
      */
     public function getPrimaryKey()
     {
@@ -266,7 +266,7 @@ public function getPrimaryKey()
     /**
      * Returns a sfWidgetForm class name for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The name of a subclass of sfWidgetForm
      */
@@ -325,13 +325,13 @@ public function getWidgetClassForColumn($column)
     /**
      * Returns a PHP string representing options to pass to a widget for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The options to pass to the widget as a PHP string
      */
     public function getWidgetOptionsForColumn($column)
     {
-        $options = array();
+        $options = [];
 
         if ($column->isForeignKey()) {
             $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'add_empty\' => %s', $column->getRelationKey('alias'), $column->isNotNull() ? 'false' : 'true');
@@ -345,7 +345,7 @@ public function getWidgetOptionsForColumn($column)
     /**
      * Returns a sfValidator class name for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The name of a subclass of sfValidator
      */
@@ -421,13 +421,13 @@ public function getValidatorClassForColumn($column)
     /**
      * Returns a PHP string representing options to pass to a validator for a given column.
      *
-     * @param sfDoctrineColumn $column
+     * @param \sfDoctrineColumn $column
      *
      * @return string The options to pass to the validator as a PHP string
      */
     public function getValidatorOptionsForColumn($column)
     {
-        $options = array();
+        $options = [];
 
         if ($column->isForeignKey()) {
             if ($foreignColumn = $column->getForeignTable()->getColumnName($column->getForeignFieldName())) {
@@ -535,7 +535,7 @@ public function getI18nModel()
 
     public function underscore($name)
     {
-        return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $name));
+        return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\\1_\\2', $name));
     }
 
     /**
@@ -546,24 +546,24 @@ public function underscore($name)
     public function getColumns()
     {
         $parentModel = $this->getParentModel();
-        $parentColumns = $parentModel ? array_keys(Doctrine_Core::getTable($parentModel)->getColumns()) : array();
+        $parentColumns = $parentModel ? array_keys(\Doctrine_Core::getTable($parentModel)->getColumns()) : [];
 
-        $columns = array();
+        $columns = [];
         foreach (array_diff(array_keys($this->table->getColumns()), $parentColumns) as $name) {
-            $columns[] = new sfDoctrineColumn($name, $this->table);
+            $columns[] = new \sfDoctrineColumn($name, $this->table);
         }
 
         // add relations to columns for inherited classes
         if ($parentModel) {
-            $parentRelationNames = array_keys(Doctrine_Core::getTable($parentModel)->getRelations());
+            $parentRelationNames = array_keys(\Doctrine_Core::getTable($parentModel)->getRelations());
             $relations = $this->table->getRelations();
-            $relationColumns = array();
+            $relationColumns = [];
             foreach (array_diff(array_keys($relations), $parentRelationNames) as $relationName) {
-                if (Doctrine_Relation::ONE == $relations[$relationName]->getType()) {
+                if (\Doctrine_Relation::ONE == $relations[$relationName]->getType()) {
                     $columnName = $relations[$relationName]->getLocal();
                     if (!in_array($columnName, $relationColumns)) {
                         $relationColumns[] = $columnName;
-                        $columns[] = new sfDoctrineColumn($columnName, $this->table);
+                        $columns[] = new \sfDoctrineColumn($columnName, $this->table);
                     }
                 }
             }
@@ -574,11 +574,11 @@ public function getColumns()
 
     public function getUniqueColumnNames()
     {
-        $uniqueColumns = array();
+        $uniqueColumns = [];
 
         foreach ($this->getColumns() as $column) {
             if ($column->getDefinitionKey('unique')) {
-                $uniqueColumns[] = array($column->getFieldName());
+                $uniqueColumns[] = [$column->getFieldName()];
             }
         }
 
@@ -602,16 +602,16 @@ public function getUniqueColumnNames()
     /**
      * Returns the name of the model class this model extends.
      *
-     * @return string|null
+     * @return \string|null
      */
     public function getParentModel()
     {
-        $baseClasses = array(
+        $baseClasses = [
             'Doctrine_Record',
             'sfDoctrineRecord',
-        );
+        ];
 
-        $builderOptions = sfConfig::get('doctrine_model_builder_options', array());
+        $builderOptions = \sfConfig::get('doctrine_model_builder_options', []);
         if (isset($builderOptions['baseClassName'])) {
             $baseClasses[] = $builderOptions['baseClassName'];
         }
@@ -623,7 +623,7 @@ public function getParentModel()
                 break;
             }
 
-            $r = new ReflectionClass($model);
+            $r = new \ReflectionClass($model);
             if (!$r->isAbstract()) {
                 return $r->getName();
             }
@@ -645,10 +645,10 @@ public function getFormClassToExtend()
      */
     protected function loadModels()
     {
-        Doctrine_Core::loadModels($this->generatorManager->getConfiguration()->getModelDirs());
-        $models = Doctrine_Core::getLoadedModels();
-        $models = Doctrine_Core::initializeModels($models);
-        $models = Doctrine_Core::filterInvalidModels($models);
+        \Doctrine_Core::loadModels($this->generatorManager->getConfiguration()->getModelDirs());
+        $models = \Doctrine_Core::getLoadedModels();
+        $models = \Doctrine_Core::initializeModels($models);
+        $models = \Doctrine_Core::filterInvalidModels($models);
         $this->models = $this->filterModels($models);
 
         return $this->models;
@@ -662,7 +662,7 @@ protected function loadModels()
     protected function filterModels($models)
     {
         foreach ($models as $key => $model) {
-            $table = Doctrine_Core::getTable($model);
+            $table = \Doctrine_Core::getTable($model);
             $symfonyOptions = (array) $table->getOption('symfony');
 
             if ($table->isGenerator()) {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
index 2883d8d18..64d1c6e04 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,16 +16,16 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerator extends sfModelGenerator
+class sfDoctrineGenerator extends \sfModelGenerator
 {
     protected $table;
 
     /**
      * Initializes the current sfGenerator instance.
      *
-     * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
+     * @param \sfGeneratorManager $generatorManager A sfGeneratorManager instance
      */
-    public function initialize(sfGeneratorManager $generatorManager)
+    public function initialize(\sfGeneratorManager $generatorManager)
     {
         parent::initialize($generatorManager);
 
@@ -36,7 +37,7 @@ public function initialize(sfGeneratorManager $generatorManager)
      */
     public function configure()
     {
-        $this->table = Doctrine_Core::getTable($this->modelClass);
+        $this->table = \Doctrine_Core::getTable($this->modelClass);
 
         // load all primary keys
         $this->loadPrimaryKeys();
@@ -51,9 +52,9 @@ public function configure()
      */
     public function getManyToManyTables()
     {
-        $relations = array();
+        $relations = [];
         foreach ($this->table->getRelations() as $relation) {
-            if (Doctrine_Relation::MANY === $relation->getType() && isset($relation['refTable'])) {
+            if (\Doctrine_Relation::MANY === $relation->getType() && isset($relation['refTable'])) {
                 $relations[] = $relation;
             }
         }
@@ -72,7 +73,7 @@ public function getManyToManyTables()
      */
     public function getColumnGetter($column, $developed = false, $prefix = '')
     {
-        $getter = 'get'.sfInflector::camelize($column);
+        $getter = 'get'.\sfInflector::camelize($column);
         if ($developed) {
             $getter = sprintf('$%s%s->%s()', $prefix, $this->getSingularName(), $getter);
         }
@@ -119,30 +120,30 @@ public function getType($column)
      */
     public function getDefaultFieldsConfiguration()
     {
-        $fields = array();
+        $fields = [];
 
-        $names = array();
+        $names = [];
         foreach ($this->getColumns() as $name => $column) {
             $names[] = $name;
-            $fields[$name] = array_merge(array(
+            $fields[$name] = array_merge([
                 'is_link' => (bool) $column->isPrimaryKey(),
                 'is_real' => true,
                 'is_partial' => false,
                 'is_component' => false,
                 'type' => $this->getType($column),
-            ), isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : array());
+            ], isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : []);
         }
 
         foreach ($this->getManyToManyTables() as $tables) {
-            $name = sfInflector::underscore($tables['alias']).'_list';
+            $name = \sfInflector::underscore($tables['alias']).'_list';
             $names[] = $name;
-            $fields[$name] = array_merge(array(
+            $fields[$name] = array_merge([
                 'is_link' => false,
                 'is_real' => false,
                 'is_partial' => false,
                 'is_component' => false,
                 'type' => 'Text',
-            ), isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : array());
+            ], isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : []);
         }
 
         if (isset($this->config['fields'])) {
@@ -151,13 +152,13 @@ public function getDefaultFieldsConfiguration()
                     continue;
                 }
 
-                $fields[$name] = array_merge(array(
+                $fields[$name] = array_merge([
                     'is_link' => false,
                     'is_real' => false,
                     'is_partial' => false,
                     'is_component' => false,
                     'type' => 'Text',
-                ), is_array($params) ? $params : array());
+                ], is_array($params) ? $params : []);
             }
         }
 
@@ -175,18 +176,18 @@ public function getDefaultFieldsConfiguration()
      */
     public function getFieldsConfiguration($context)
     {
-        $fields = array();
+        $fields = [];
 
-        $names = array();
+        $names = [];
         foreach ($this->getColumns() as $name => $column) {
             $names[] = $name;
-            $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
+            $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : [];
         }
 
         foreach ($this->getManyToManyTables() as $tables) {
-            $name = sfInflector::underscore($tables['alias']).'_list';
+            $name = \sfInflector::underscore($tables['alias']).'_list';
             $names[] = $name;
-            $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
+            $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : [];
         }
 
         if (isset($this->config[$context]['fields'])) {
@@ -195,7 +196,7 @@ public function getFieldsConfiguration($context)
                     continue;
                 }
 
-                $fields[$name] = is_array($params) ? $params : array();
+                $fields[$name] = is_array($params) ? $params : [];
             }
         }
 
@@ -213,14 +214,14 @@ public function getFieldsConfiguration($context)
      */
     public function getAllFieldNames($withM2M = true)
     {
-        $names = array();
+        $names = [];
         foreach ($this->getColumns() as $name => $column) {
             $names[] = $name;
         }
 
         if ($withM2M) {
             foreach ($this->getManyToManyTables() as $tables) {
-                $names[] = sfInflector::underscore($tables['alias']).'_list';
+                $names[] = \sfInflector::underscore($tables['alias']).'_list';
             }
         }
 
@@ -236,7 +237,7 @@ public function getColumns()
     {
         foreach (array_keys($this->table->getColumns()) as $name) {
             $name = $this->table->getFieldName($name);
-            $columns[$name] = new sfDoctrineColumn($name, $this->table);
+            $columns[$name] = new \sfDoctrineColumn($name, $this->table);
         }
 
         return $columns;
@@ -245,11 +246,11 @@ public function getColumns()
     /**
      * Loads primary keys.
      *
-     * @throws sfException
+     * @throws \sfException
      */
     protected function loadPrimaryKeys()
     {
-        $this->primaryKey = array();
+        $this->primaryKey = [];
         foreach ($this->getColumns() as $name => $column) {
             if ($column->isPrimaryKey()) {
                 $this->primaryKey[] = $name;
@@ -257,7 +258,7 @@ protected function loadPrimaryKeys()
         }
 
         if (!count($this->primaryKey)) {
-            throw new sfException(sprintf('Cannot generate a module for a model without a primary key (%s)', $this->modelClass));
+            throw new \sfException(sprintf('Cannot generate a module for a model without a primary key (%s)', $this->modelClass));
         }
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
index 7235a2e1e..efb976f73 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,7 +23,7 @@
  *
  * @version    SVN: $Id$
  */
-class Swift_DoctrineSpool extends Swift_ConfigurableSpool
+class Swift_DoctrineSpool extends \Swift_ConfigurableSpool
 {
     protected $model;
     protected $column;
@@ -69,14 +70,14 @@ public function stop()
     /**
      * Stores a message in the queue.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param \Swift_Mime_Message $message The message to store
      */
-    public function queueMessage(Swift_Mime_Message $message)
+    public function queueMessage(\Swift_Mime_Message $message)
     {
         $object = new $this->model();
 
-        if (!$object instanceof Doctrine_Record) {
-            throw new InvalidArgumentException('The mailer message object must be a Doctrine_Record object.');
+        if (!$object instanceof \Doctrine_Record) {
+            throw new \InvalidArgumentException('The mailer message object must be a Doctrine_Record object.');
         }
 
         $object->{$this->column} = serialize($message);
@@ -88,14 +89,14 @@ public function queueMessage(Swift_Mime_Message $message)
     /**
      * Sends messages using the given transport instance.
      *
-     * @param Swift_Transport $transport         A transport instance
-     * @param string[]        &$failedRecipients An array of failures by-reference
+     * @param \Swift_Transport $transport         A transport instance
+     * @param string[]         &$failedRecipients An array of failures by-reference
      *
      * @return int The number of sent emails
      */
-    public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
+    public function flushQueue(\Swift_Transport $transport, &$failedRecipients = null)
     {
-        $table = Doctrine_Core::getTable($this->model);
+        $table = \Doctrine_Core::getTable($this->model);
         $objects = $table->{$this->method}()->limit($this->getMessageLimit())->execute();
 
         if (!$transport->isStarted()) {
@@ -111,7 +112,7 @@ public function flushQueue(Swift_Transport $transport, &$failedRecipients = null
 
             try {
                 $count += $transport->send($message, $failedRecipients);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 // TODO: What to do with errors?
             }
 
diff --git a/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php b/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
index c603f5475..aaaaa9768 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrinePager extends sfPager implements Serializable
+class sfDoctrinePager extends \sfPager implements \Serializable
 {
     protected $query;
     protected $tableMethodName;
@@ -94,7 +94,7 @@ public function unserialize($serialized)
     /**
      * Returns a query for counting the total results.
      *
-     * @return Doctrine_Query
+     * @return \Doctrine_Query
      */
     public function getCountQuery()
     {
@@ -108,7 +108,7 @@ public function getCountQuery()
     }
 
     /**
-     * @see sfPager
+     * @see \sfPager
      */
     public function init()
     {
@@ -142,16 +142,16 @@ public function init()
     /**
      * Get the query for the pager.
      *
-     * @return Doctrine_Query
+     * @return \Doctrine_Query
      */
     public function getQuery()
     {
         if (!$this->tableMethodCalled && $this->tableMethodName) {
             $method = $this->tableMethodName;
-            $this->query = Doctrine_Core::getTable($this->getClass())->{$method}($this->query);
+            $this->query = \Doctrine_Core::getTable($this->getClass())->{$method}($this->query);
             $this->tableMethodCalled = true;
         } elseif (!$this->query) {
-            $this->query = Doctrine_Core::getTable($this->getClass())->createQuery();
+            $this->query = \Doctrine_Core::getTable($this->getClass())->createQuery();
         }
 
         return $this->query;
@@ -160,7 +160,7 @@ public function getQuery()
     /**
      * Set query object for the pager.
      *
-     * @param Doctrine_Query $query
+     * @param \Doctrine_Query $query
      */
     public function setQuery($query)
     {
@@ -176,7 +176,7 @@ public function setQuery($query)
      */
     public function getResults($hydrationMode = null)
     {
-        return $this->getQuery()->execute(array(), $hydrationMode);
+        return $this->getQuery()->execute([], $hydrationMode);
     }
 
     /**
@@ -184,7 +184,7 @@ public function getResults($hydrationMode = null)
      *
      * @param int $offset
      *
-     * @return Doctrine_Record
+     * @return \Doctrine_Record
      */
     protected function retrieveObject($offset)
     {
@@ -200,13 +200,13 @@ protected function retrieveObject($offset)
     }
 
     /**
-     * @see sfPager
+     * @see \sfPager
      */
     protected function initializeIterator()
     {
         parent::initializeIterator();
 
-        if ($this->results instanceof Doctrine_Collection) {
+        if ($this->results instanceof \Doctrine_Collection) {
             $this->results = $this->results->getData();
         }
     }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
index ee4693fa3..aff8b8406 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfDoctrineRecord extends Doctrine_Record
+abstract class sfDoctrineRecord extends \Doctrine_Record
 {
     protected static $_defaultCulture = 'en';
 
@@ -29,18 +29,18 @@ abstract class sfDoctrineRecord extends Doctrine_Record
      */
     public function __toString()
     {
-        $guesses = array('name',
+        $guesses = ['name',
             'title',
             'description',
             'subject',
             'keywords',
-            'id');
+            'id'];
 
         // we try to guess a column which would give a good description of the object
         foreach ($guesses as $descriptionColumn) {
             try {
                 return (string) $this->get($descriptionColumn);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
             }
         }
 
@@ -60,7 +60,7 @@ public function __call($method, $arguments)
         $failed = false;
 
         try {
-            if (in_array($verb = substr($method, 0, 3), array('set', 'get'))) {
+            if (in_array($verb = substr($method, 0, 3), ['set', 'get'])) {
                 $name = substr($method, 3);
 
                 $table = $this->getTable();
@@ -74,13 +74,13 @@ public function __call($method, $arguments)
                         $entityName = $fieldName;
                     }
                 } else {
-                    $underScored = $table->getFieldName(sfInflector::underscore($name));
+                    $underScored = $table->getFieldName(\sfInflector::underscore($name));
                     if ($table->hasField($underScored) || $table->hasRelation($underScored)) {
                         $entityName = $underScored;
                     } elseif ($table->hasField(strtolower($name)) || $table->hasRelation(strtolower($name))) {
                         $entityName = strtolower($name);
                     } else {
-                        $camelCase = $table->getFieldName(sfInflector::camelize($name));
+                        $camelCase = $table->getFieldName(\sfInflector::camelize($name));
                         $camelCase = strtolower($camelCase[0]).substr($camelCase, 1, strlen($camelCase));
                         if ($table->hasField($camelCase) || $table->hasRelation($camelCase)) {
                             $entityName = $camelCase;
@@ -91,18 +91,18 @@ public function __call($method, $arguments)
                 }
 
                 return call_user_func_array(
-                    array($this, $verb),
-                    array_merge(array($entityName), $arguments)
+                    [$this, $verb],
+                    array_merge([$entityName], $arguments)
                 );
             }
             $failed = true;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $failed = true;
         }
         if ($failed) {
             try {
                 return parent::__call($method, $arguments);
-            } catch (Doctrine_Record_UnknownPropertyException $e2) {
+            } catch (\Doctrine_Record_UnknownPropertyException $e2) {
             }
 
             if (isset($e) && $e) {
@@ -117,7 +117,7 @@ public function __call($method, $arguments)
     /**
      * Initializes internationalization.
      *
-     * @see Doctrine_Record
+     * @see \Doctrine_Record
      */
     public function construct()
     {
@@ -125,7 +125,7 @@ public function construct()
             // only add filter to each table once
             if (!$this->getTable()->getOption('has_symfony_i18n_filter')) {
                 $this->getTable()
-                    ->unshiftFilter(new sfDoctrineRecordI18nFilter())
+                    ->unshiftFilter(new \sfDoctrineRecordI18nFilter())
                     ->setOption('has_symfony_i18n_filter', true)
                 ;
             }
@@ -135,9 +135,9 @@ public function construct()
     /**
      * Listens to the user.change_culture event.
      *
-     * @param sfEvent An sfEvent instance
+     * @param \sfEvent An sfEvent instance
      */
-    public static function listenToChangeCultureEvent(sfEvent $event)
+    public static function listenToChangeCultureEvent(\sfEvent $event)
     {
         self::$_defaultCulture = $event['culture'];
     }
@@ -160,7 +160,7 @@ public static function setDefaultCulture($culture)
     public static function getDefaultCulture()
     {
         if (!self::$_defaultCulture) {
-            throw new sfException('The default culture has not been set');
+            throw new \sfException('The default culture has not been set');
         }
 
         return self::$_defaultCulture;
@@ -196,9 +196,9 @@ public function isNew()
      *
      * @param string $dateFieldName The field name to get the DateTime object for
      *
-     * @return DateTime|null $dateTime     The instance of PHPs DateTime
+     * @return \DateTime|null $dateTime     The instance of PHPs DateTime
      *
-     * @throws sfException if the field is not one of date, datetime, or timestamp types
+     * @throws \sfException if the field is not one of date, datetime, or timestamp types
      */
     public function getDateTimeObject($dateFieldName)
     {
@@ -206,24 +206,24 @@ public function getDateTimeObject($dateFieldName)
         if ('date' == $type || 'timestamp' == $type || 'datetime' == $type) {
             $datetime = $this->get($dateFieldName);
             if ($datetime) {
-                return new DateTime($datetime);
+                return new \DateTime($datetime);
             }
         } else {
-            throw new sfException('Cannot call getDateTimeObject() on a field that is not of type date or timestamp.');
+            throw new \sfException('Cannot call getDateTimeObject() on a field that is not of type date or timestamp.');
         }
     }
 
     /**
      * Set the Doctrine date value by passing a valid PHP DateTime object instance.
      *
-     * @param string   $dateFieldName  The field name to set the date for
-     * @param DateTime $dateTimeObject The DateTime instance to use to set the value
+     * @param string    $dateFieldName  The field name to set the date for
+     * @param \DateTime $dateTimeObject The DateTime instance to use to set the value
      *
-     * @return sfDoctrineRecord
+     * @return \sfDoctrineRecord
      *
-     * @throws sfException if the field is not one of date, datetime, or timestamp types
+     * @throws \sfException if the field is not one of date, datetime, or timestamp types
      */
-    public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject = null)
+    public function setDateTimeObject($dateFieldName, \DateTime $dateTimeObject = null)
     {
         $type = $this->getTable()->getTypeOf($dateFieldName);
         if ('date' == $type || 'timestamp' == $type || 'datetime' == $type) {
@@ -234,6 +234,6 @@ public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject = nul
             return $this->set($dateFieldName, $dateTimeObject->format('Y-m-d H:i:s'));
         }
 
-        throw new sfException('Cannot call setDateTimeObject() on a field that is not of type date or timestamp.');
+        throw new \sfException('Cannot call setDateTimeObject() on a field that is not of type date or timestamp.');
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
index 43e82ce65..6eee52c58 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineRecordI18nFilter extends Doctrine_Record_Filter
+class sfDoctrineRecordI18nFilter extends \Doctrine_Record_Filter
 {
     /**
      * @see Doctrine_Table::unshiftFilter()
@@ -33,9 +34,9 @@ public function init()
      * @param string $name  Name of the property
      * @param string $value Value of the property
      */
-    public function filterSet(Doctrine_Record $record, $name, $value)
+    public function filterSet(\Doctrine_Record $record, $name, $value)
     {
-        return $record['Translation'][sfDoctrineRecord::getDefaultCulture()][$name] = $value;
+        return $record['Translation'][\sfDoctrineRecord::getDefaultCulture()][$name] = $value;
     }
 
     /**
@@ -45,14 +46,14 @@ public function filterSet(Doctrine_Record $record, $name, $value)
      *
      * @param string $name Name of the property
      */
-    public function filterGet(Doctrine_Record $record, $name)
+    public function filterGet(\Doctrine_Record $record, $name)
     {
-        $culture = sfDoctrineRecord::getDefaultCulture();
+        $culture = \sfDoctrineRecord::getDefaultCulture();
         if (isset($record['Translation'][$culture]) && '' != $record['Translation'][$culture][$name]) {
             return $record['Translation'][$culture][$name];
         }
 
-        $defaultCulture = sfConfig::get('sf_default_culture');
+        $defaultCulture = \sfConfig::get('sf_default_culture');
 
         return $record['Translation'][$defaultCulture][$name];
     }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
index b423ef966..0256915fc 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,14 +19,14 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineRoute extends sfObjectRoute
+class sfDoctrineRoute extends \sfObjectRoute
 {
     protected $query;
 
-    public function setListQuery(Doctrine_Query $query)
+    public function setListQuery(\Doctrine_Query $query)
     {
         if (!$this->isBound()) {
-            throw new LogicException('The route is not bound.');
+            throw new \LogicException('The route is not bound.');
         }
 
         $this->query = $query;
@@ -38,7 +38,7 @@ protected function getObjectForParameters($parameters)
 
         // If query returned Doctrine_Collection with results inside then we
         // need to return the first Doctrine_Record
-        if ($results instanceof Doctrine_Collection) {
+        if ($results instanceof \Doctrine_Collection) {
             if (count($results)) {
                 $results = $results->getFirst();
             } else {
@@ -55,10 +55,10 @@ protected function getObjectForParameters($parameters)
 
     protected function getObjectsForParameters($parameters)
     {
-        $tableModel = Doctrine_Core::getTable($this->options['model']);
+        $tableModel = \Doctrine_Core::getTable($this->options['model']);
 
-        $variables = array();
-        $values = array();
+        $variables = [];
+        $values = [];
         foreach ($this->getRealVariables() as $variable) {
             if ($tableModel->hasColumn($tableModel->getColumnName($variable))) {
                 $variables[] = $variable;
@@ -90,9 +90,9 @@ protected function getObjectsForParameters($parameters)
         // If query returned a Doctrine_Record instance instead of a
         // Doctrine_Collection then we need to create a new Doctrine_Collection with
         // one element inside and return that
-        if ($results instanceof Doctrine_Record) {
+        if ($results instanceof \Doctrine_Record) {
             $obj = $results;
-            $results = new Doctrine_Collection($obj->getTable());
+            $results = new \Doctrine_Collection($obj->getTable());
             $results[] = $obj;
         }
 
@@ -105,15 +105,15 @@ protected function doConvertObjectToArray($object)
             return parent::doConvertObjectToArray($object);
         }
 
-        $parameters = array();
+        $parameters = [];
         foreach ($this->getRealVariables() as $variable) {
             try {
                 $parameters[$variable] = $object->{$variable};
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 try {
-                    $method = 'get'.sfInflector::camelize($variable);
+                    $method = 'get'.\sfInflector::camelize($variable);
                     $parameters[$variable] = $object->{$method}();
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                 }
             }
         }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
index 887f54fd1..05d73f5de 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineRouteCollection extends sfObjectRouteCollection
+class sfDoctrineRouteCollection extends \sfObjectRouteCollection
 {
     protected $routeClass = 'sfDoctrineRoute';
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
index d42b25720..a783e5741 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,6 +17,6 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineException extends sfException
+class sfDoctrineException extends \sfException
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
index 8df114ab7..e19550a48 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfDoctrineBaseTask extends sfBaseTask
+abstract class sfDoctrineBaseTask extends \sfBaseTask
 {
     /**
      * Returns an array of configuration variables for the Doctrine CLI.
@@ -37,13 +37,13 @@ public function getCliConfig()
      * @param string $task Name of the Doctrine task to call
      * @param array  $args Arguments for the task
      *
-     * @see sfDoctrineCli
+     * @see \sfDoctrineCli
      */
-    public function callDoctrineCli($task, $args = array())
+    public function callDoctrineCli($task, $args = [])
     {
         $config = $this->getCliConfig();
 
-        $arguments = array('./symfony', $task);
+        $arguments = ['./symfony', $task];
 
         foreach ($args as $key => $arg) {
             if (isset($config[$key])) {
@@ -53,7 +53,7 @@ public function callDoctrineCli($task, $args = array())
             }
         }
 
-        $cli = new sfDoctrineCli($config);
+        $cli = new \sfDoctrineCli($config);
         $cli->setSymfonyDispatcher($this->dispatcher);
         $cli->setSymfonyFormatter($this->formatter);
         $cli->run($arguments);
@@ -62,21 +62,21 @@ public function callDoctrineCli($task, $args = array())
     /**
      * Returns Doctrine databases from the supplied database manager.
      *
-     * @param array|null $names An array of names or NULL for all databases
+     * @param \array|null $names An array of names or NULL for all databases
      *
      * @return array An associative array of {@link sfDoctrineDatabase} objects and their names
      *
-     * @throws InvalidArgumentException If a requested database is not a Doctrine database
+     * @throws \InvalidArgumentException If a requested database is not a Doctrine database
      */
-    protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, array $names = null)
+    protected function getDoctrineDatabases(\sfDatabaseManager $databaseManager, array $names = null)
     {
-        $databases = array();
+        $databases = [];
 
         if (null === $names) {
             foreach ($databaseManager->getNames() as $name) {
                 $database = $databaseManager->getDatabase($name);
 
-                if ($database instanceof sfDoctrineDatabase) {
+                if ($database instanceof \sfDoctrineDatabase) {
                     $databases[$name] = $database;
                 }
             }
@@ -84,8 +84,8 @@ protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, arra
             foreach ($names as $name) {
                 $database = $databaseManager->getDatabase($name);
 
-                if (!$database instanceof sfDoctrineDatabase) {
-                    throw new InvalidArgumentException(sprintf('The database "%s" is not a Doctrine database.', $name));
+                if (!$database instanceof \sfDoctrineDatabase) {
+                    throw new \InvalidArgumentException(sprintf('The database "%s" is not a Doctrine database.', $name));
                 }
 
                 $databases[$name] = $database;
@@ -117,14 +117,14 @@ protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, arra
      */
     protected function prepareSchemaFile($yamlSchemaPath)
     {
-        $models = array();
-        $finder = sfFinder::type('file')->name('*.yml')->sort_by_name()->follow_link();
+        $models = [];
+        $finder = \sfFinder::type('file')->name('*.yml')->sort_by_name()->follow_link();
 
         // plugin models
         foreach ($this->configuration->getPlugins() as $name) {
             $plugin = $this->configuration->getPluginConfiguration($name);
             foreach ($finder->in($plugin->getRootDir().'/config/doctrine') as $schema) {
-                $pluginModels = (array) sfYaml::load($schema);
+                $pluginModels = (array) \sfYaml::load($schema);
                 $globals = $this->filterSchemaGlobals($pluginModels);
 
                 foreach ($pluginModels as $model => $definition) {
@@ -135,14 +135,14 @@ protected function prepareSchemaFile($yamlSchemaPath)
                     $definition = array_merge($globals, $definition);
 
                     // merge this model into the schema
-                    $models[$model] = isset($models[$model]) ? sfToolkit::arrayDeepMerge($models[$model], $definition) : $definition;
+                    $models[$model] = isset($models[$model]) ? \sfToolkit::arrayDeepMerge($models[$model], $definition) : $definition;
 
                     // the first plugin to define this model gets the package
                     if (!isset($models[$model]['package'])) {
                         $models[$model]['package'] = $plugin->getName().'.lib.model.doctrine';
                     }
 
-                    if (!isset($models[$model]['package_custom_path']) && 0 === strpos($models[$model]['package'], $plugin->getName())) {
+                    if (!isset($models[$model]['package_custom_path']) &&   str_starts_with($models[$model]['package'], $plugin->getName())) {
                         $models[$model]['package_custom_path'] = $plugin->getRootDir().'/lib/model/doctrine';
                     }
                 }
@@ -151,7 +151,7 @@ protected function prepareSchemaFile($yamlSchemaPath)
 
         // project models
         foreach ($finder->in($yamlSchemaPath) as $schema) {
-            $projectModels = (array) sfYaml::load($schema);
+            $projectModels = (array) \sfYaml::load($schema);
             $globals = $this->filterSchemaGlobals($projectModels);
 
             foreach ($projectModels as $model => $definition) {
@@ -162,14 +162,14 @@ protected function prepareSchemaFile($yamlSchemaPath)
                 $definition = array_merge($globals, $definition);
 
                 // merge this model into the schema
-                $models[$model] = isset($models[$model]) ? sfToolkit::arrayDeepMerge($models[$model], $definition) : $definition;
+                $models[$model] = isset($models[$model]) ? \sfToolkit::arrayDeepMerge($models[$model], $definition) : $definition;
             }
         }
 
         // create one consolidated schema file
         $file = realpath(sys_get_temp_dir()).'/doctrine_schema_'.rand(11111, 99999).'.yml';
         $this->logSection('file+', $file);
-        file_put_contents($file, sfYaml::dump($models, 4));
+        file_put_contents($file, \sfYaml::dump($models, 4));
 
         return $file;
     }
@@ -185,8 +185,8 @@ protected function prepareSchemaFile($yamlSchemaPath)
      */
     protected function filterSchemaGlobals(&$models)
     {
-        $globals = array();
-        $globalKeys = Doctrine_Import_Schema::getGlobalDefinitionKeys();
+        $globals = [];
+        $globalKeys = \Doctrine_Import_Schema::getGlobalDefinitionKeys();
 
         foreach ($models as $key => $value) {
             if (in_array($key, $globalKeys)) {
@@ -212,7 +212,7 @@ protected function canonicalizeModelDefinition($model, $definition)
         if (isset($definition['columns'])) {
             foreach ($definition['columns'] as $key => $value) {
                 if (!is_array($value)) {
-                    $definition['columns'][$key] = array('type' => $value);
+                    $definition['columns'][$key] = ['type' => $value];
                     $value = $definition['columns'][$key];
                 }
 
@@ -232,7 +232,7 @@ protected function canonicalizeModelDefinition($model, $definition)
         if (isset($definition['actAs'])) {
             foreach ($definition['actAs'] as $key => $value) {
                 if (is_numeric($key)) {
-                    $definition['actAs'][$value] = array();
+                    $definition['actAs'][$value] = [];
                     unset($definition['actAs'][$key]);
                 }
             }
@@ -242,7 +242,7 @@ protected function canonicalizeModelDefinition($model, $definition)
         if (isset($definition['listeners'])) {
             foreach ($definition['listeners'] as $key => $value) {
                 if (is_numeric($key)) {
-                    $definition['listeners'][$value] = array();
+                    $definition['listeners'][$value] = [];
                     unset($definition['listeners'][$key]);
                 }
             }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
index d6224071f..6e683836e 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,23 +19,23 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildDbTask extends sfDoctrineBaseTask
+class sfDoctrineBuildDbTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('database', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'A specific database'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('database', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'A specific database'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
-        $this->aliases = array('doctrine:create-db');
+        $this->aliases = ['doctrine:create-db'];
         $this->namespace = 'doctrine';
         $this->name = 'build-db';
         $this->briefDescription = 'Creates database for current model';
@@ -53,21 +53,21 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $databases = $this->getDoctrineDatabases($databaseManager, count($arguments['database']) ? $arguments['database'] : null);
 
-        $environment = $this->configuration instanceof sfApplicationConfiguration ? $this->configuration->getEnvironment() : 'all';
+        $environment = $this->configuration instanceof \sfApplicationConfiguration ? $this->configuration->getEnvironment() : 'all';
 
         foreach ($databases as $name => $database) {
             $this->logSection('doctrine', sprintf('Creating "%s" environment "%s" database', $environment, $name));
 
             try {
                 $database->getDoctrineConnection()->createDatabase();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->logSection('doctrine', $e->getMessage(), null, 'ERROR');
             }
         }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
index 0ea03d7a7..dbb2010bc 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
@@ -1,10 +1,11 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license informationation, please view the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -17,20 +18,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildFiltersTask extends sfDoctrineBaseTask
+class sfDoctrineBuildFiltersTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('model-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The model dir name', 'model'),
-            new sfCommandOption('filter-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The filter form dir name', 'filter'),
-            new sfCommandOption('generator-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The generator class', 'sfDoctrineFormFilterGenerator'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('model-dir-name', null, \sfCommandOption::PARAMETER_REQUIRED, 'The model dir name', 'model'),
+            new \sfCommandOption('filter-dir-name', null, \sfCommandOption::PARAMETER_REQUIRED, 'The filter form dir name', 'filter'),
+            new \sfCommandOption('generator-class', null, \sfCommandOption::PARAMETER_REQUIRED, 'The generator class', 'sfDoctrineFormFilterGenerator'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'build-filters';
@@ -50,28 +51,28 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('doctrine', 'generating filter form classes');
-        $databaseManager = new sfDatabaseManager($this->configuration);
-        $generatorManager = new sfGeneratorManager($this->configuration);
-        $generatorManager->generate($options['generator-class'], array(
+        $databaseManager = new \sfDatabaseManager($this->configuration);
+        $generatorManager = new \sfGeneratorManager($this->configuration);
+        $generatorManager->generate($options['generator-class'], [
             'model_dir_name' => $options['model-dir-name'],
             'filter_dir_name' => $options['filter-dir-name'],
-        ));
+        ]);
 
-        $properties = parse_ini_file(sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'properties.ini', true);
+        $properties = parse_ini_file(\sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'properties.ini', true);
 
-        $constants = array(
+        $constants = [
             'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
             'AUTHOR_NAME' => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
-        );
+        ];
 
         // customize php and yml files
-        $finder = sfFinder::type('file')->name('*.php');
-        $this->getFilesystem()->replaceTokens($finder->in(sfConfig::get('sf_lib_dir').'/filter/'), '##', '##', $constants);
+        $finder = \sfFinder::type('file')->name('*.php');
+        $this->getFilesystem()->replaceTokens($finder->in(\sfConfig::get('sf_lib_dir').'/filter/'), '##', '##', $constants);
 
         $this->reloadAutoload();
     }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
index 91f277c38..f788278a8 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,20 +18,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildFormsTask extends sfDoctrineBaseTask
+class sfDoctrineBuildFormsTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('model-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The model dir name', 'model'),
-            new sfCommandOption('form-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The form dir name', 'form'),
-            new sfCommandOption('generator-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The generator class', 'sfDoctrineFormGenerator'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('model-dir-name', null, \sfCommandOption::PARAMETER_REQUIRED, 'The model dir name', 'model'),
+            new \sfCommandOption('form-dir-name', null, \sfCommandOption::PARAMETER_REQUIRED, 'The form dir name', 'form'),
+            new \sfCommandOption('generator-class', null, \sfCommandOption::PARAMETER_REQUIRED, 'The generator class', 'sfDoctrineFormGenerator'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'build-forms';
@@ -50,33 +51,33 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('doctrine', 'generating form classes');
-        $databaseManager = new sfDatabaseManager($this->configuration);
-        $generatorManager = new sfGeneratorManager($this->configuration);
-        $generatorManager->generate($options['generator-class'], array(
+        $databaseManager = new \sfDatabaseManager($this->configuration);
+        $generatorManager = new \sfGeneratorManager($this->configuration);
+        $generatorManager->generate($options['generator-class'], [
             'model_dir_name' => $options['model-dir-name'],
             'form_dir_name' => $options['form-dir-name'],
-        ));
+        ]);
 
-        $properties = parse_ini_file(sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'properties.ini', true);
+        $properties = parse_ini_file(\sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'properties.ini', true);
 
-        $constants = array(
+        $constants = [
             'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
             'AUTHOR_NAME' => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
-        );
+        ];
 
         // customize php and yml files
-        $finder = sfFinder::type('file')->name('*.php');
-        $this->getFilesystem()->replaceTokens($finder->in(sfConfig::get('sf_lib_dir').'/form/'), '##', '##', $constants);
+        $finder = \sfFinder::type('file')->name('*.php');
+        $this->getFilesystem()->replaceTokens($finder->in(\sfConfig::get('sf_lib_dir').'/form/'), '##', '##', $constants);
 
         // check for base form class
         if (!class_exists('BaseForm')) {
-            $file = sfConfig::get('sf_lib_dir').'/'.$options['form-dir-name'].'/BaseForm.class.php';
-            $this->getFilesystem()->copy(sfConfig::get('sf_symfony_lib_dir').'/task/generator/skeleton/project/lib/form/BaseForm.class.php', $file);
+            $file = \sfConfig::get('sf_lib_dir').'/'.$options['form-dir-name'].'/BaseForm.class.php';
+            $this->getFilesystem()->copy(\sfConfig::get('sf_symfony_lib_dir').'/task/generator/skeleton/project/lib/form/BaseForm.class.php', $file);
             $this->getFilesystem()->replaceTokens($file, '##', '##', $constants);
         }
 
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
index 53e4873a4..5d6d565cb 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildModelTask extends sfDoctrineBaseTask
+class sfDoctrineBuildModelTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'build-model';
@@ -51,43 +51,43 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('doctrine', 'generating model classes');
 
         $config = $this->getCliConfig();
         $builderOptions = $this->configuration->getPluginConfiguration('sfDoctrinePlugin')->getModelBuilderOptions();
 
-        $stubFinder = sfFinder::type('file')->prune('base')->name('*'.$builderOptions['suffix']);
+        $stubFinder = \sfFinder::type('file')->prune('base')->name('*'.$builderOptions['suffix']);
         $before = $stubFinder->in($config['models_path']);
 
         $schema = $this->prepareSchemaFile($config['yaml_schema_path']);
 
-        $import = new Doctrine_Import_Schema();
+        $import = new \Doctrine_Import_Schema();
         $import->setOptions($builderOptions);
         $import->importSchema($schema, 'yml', $config['models_path']);
 
         // markup base classes with magic methods
-        foreach (sfYaml::load($schema) as $model => $definition) {
+        foreach (\sfYaml::load($schema) as $model => $definition) {
             $file = sprintf('%s%s/%s/Base%s%s', $config['models_path'], isset($definition['package']) ? '/'.substr($definition['package'], 0, strpos($definition['package'], '.')) : '', $builderOptions['baseClassesDirectory'], $model, $builderOptions['suffix']);
             $code = file_get_contents($file);
 
             // introspect the model without loading the class
             if (preg_match_all('/@property (\w+) \$(\w+)/', $code, $matches, PREG_SET_ORDER)) {
-                $properties = array();
+                $properties = [];
                 foreach ($matches as $match) {
                     $properties[$match[2]] = $match[1];
                 }
 
-                $typePad = max(array_map('strlen', array_merge(array_values($properties), array($model))));
-                $namePad = max(array_map('strlen', array_keys(array_map(array('sfInflector', 'camelize'), $properties))));
-                $setters = array();
-                $getters = array();
+                $typePad = max(array_map('strlen', array_merge(array_values($properties), [$model])));
+                $namePad = max(array_map('strlen', array_keys(array_map(['sfInflector', 'camelize'], $properties))));
+                $setters = [];
+                $getters = [];
 
                 foreach ($properties as $name => $type) {
-                    $camelized = sfInflector::camelize($name);
+                    $camelized = \sfInflector::camelize($name);
                     $collection = 'Doctrine_Collection' == $type;
 
                     $getters[] = sprintf('@method %-'.$typePad.'s %s%-'.($namePad + 2).'s Returns the current record\'s "%s" %s', $type, 'get', $camelized.'()', $name, $collection ? 'collection' : 'value');
@@ -100,22 +100,22 @@ protected function execute($arguments = array(), $options = array())
             }
         }
 
-        $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-        $tokens = array(
+        $properties = parse_ini_file(\sfConfig::get('sf_config_dir').'/properties.ini', true);
+        $tokens = [
             '##PACKAGE##' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
             '##SUBPACKAGE##' => 'model',
             '##NAME##' => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
             ' <##EMAIL##>' => '',
             "{\n\n}" => "{\n}\n",
-        );
+        ];
 
         // cleanup new stub classes
         $after = $stubFinder->in($config['models_path']);
         $this->getFilesystem()->replaceTokens(array_diff($after, $before), '', '', $tokens);
 
         // cleanup base classes
-        $baseFinder = sfFinder::type('file')->name('Base*'.$builderOptions['suffix']);
-        $baseDirFinder = sfFinder::type('dir')->name('base');
+        $baseFinder = \sfFinder::type('file')->name('Base*'.$builderOptions['suffix']);
+        $baseDirFinder = \sfFinder::type('dir')->name('base');
         $this->getFilesystem()->replaceTokens($baseFinder->in($baseDirFinder->in($config['models_path'])), '', '', $tokens);
 
         $this->reloadAutoload();
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
index 0d9c602a0..a25b17e1f 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildSchemaTask extends sfDoctrineBaseTask
+class sfDoctrineBuildSchemaTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'build-schema';
@@ -45,13 +45,13 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('doctrine', 'generating yaml schema from database');
 
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $this->callDoctrineCli('generate-yaml-db');
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
index 37ccd13f5..a295d2fe9 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildSqlTask extends sfDoctrineBaseTask
+class sfDoctrineBuildSqlTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'build-sql';
@@ -47,18 +47,18 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('doctrine', 'generating sql for models');
 
-        $path = sfConfig::get('sf_data_dir').'/sql';
+        $path = \sfConfig::get('sf_data_dir').'/sql';
         if (!is_dir($path)) {
             $this->getFilesystem()->mkdirs($path);
         }
 
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $this->callDoctrineCli('generate-sql');
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
index 618d353ae..11761c163 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineBuildTask extends sfDoctrineBaseTask
+class sfDoctrineBuildTask extends \sfDoctrineBaseTask
 {
     public const BUILD_MODEL = 1;
     public const BUILD_FORMS = 2;
@@ -39,25 +39,25 @@ class sfDoctrineBuildTask extends sfDoctrineBaseTask
       OPTION_ALL = 31; // model, forms, filters, sql, db
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
-            new sfCommandOption('all', null, sfCommandOption::PARAMETER_NONE, 'Build everything and reset the database'),
-            new sfCommandOption('all-classes', null, sfCommandOption::PARAMETER_NONE, 'Build all classes'),
-            new sfCommandOption('model', null, sfCommandOption::PARAMETER_NONE, 'Build model classes'),
-            new sfCommandOption('forms', null, sfCommandOption::PARAMETER_NONE, 'Build form classes'),
-            new sfCommandOption('filters', null, sfCommandOption::PARAMETER_NONE, 'Build filter classes'),
-            new sfCommandOption('sql', null, sfCommandOption::PARAMETER_NONE, 'Build SQL'),
-            new sfCommandOption('db', null, sfCommandOption::PARAMETER_NONE, 'Drop, create, and either insert SQL or migrate the database'),
-            new sfCommandOption('and-migrate', null, sfCommandOption::PARAMETER_NONE, 'Migrate the database'),
-            new sfCommandOption('and-load', null, sfCommandOption::PARAMETER_OPTIONAL | sfCommandOption::IS_ARRAY, 'Load fixture data'),
-            new sfCommandOption('and-append', null, sfCommandOption::PARAMETER_OPTIONAL | sfCommandOption::IS_ARRAY, 'Append fixture data'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('no-confirmation', null, \sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
+            new \sfCommandOption('all', null, \sfCommandOption::PARAMETER_NONE, 'Build everything and reset the database'),
+            new \sfCommandOption('all-classes', null, \sfCommandOption::PARAMETER_NONE, 'Build all classes'),
+            new \sfCommandOption('model', null, \sfCommandOption::PARAMETER_NONE, 'Build model classes'),
+            new \sfCommandOption('forms', null, \sfCommandOption::PARAMETER_NONE, 'Build form classes'),
+            new \sfCommandOption('filters', null, \sfCommandOption::PARAMETER_NONE, 'Build filter classes'),
+            new \sfCommandOption('sql', null, \sfCommandOption::PARAMETER_NONE, 'Build SQL'),
+            new \sfCommandOption('db', null, \sfCommandOption::PARAMETER_NONE, 'Drop, create, and either insert SQL or migrate the database'),
+            new \sfCommandOption('and-migrate', null, \sfCommandOption::PARAMETER_NONE, 'Migrate the database'),
+            new \sfCommandOption('and-load', null, \sfCommandOption::PARAMETER_OPTIONAL | \sfCommandOption::IS_ARRAY, 'Load fixture data'),
+            new \sfCommandOption('and-append', null, \sfCommandOption::PARAMETER_OPTIONAL | \sfCommandOption::IS_ARRAY, 'Append fixture data'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'build';
@@ -116,25 +116,25 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         if (!$mode = $this->calculateMode($options)) {
-            throw new InvalidArgumentException(sprintf("You must include one or more of the following build options:\n--%s\n\nSee this task's help page for more information:\n\n  php symfony help doctrine:build", join(', --', array_keys($this->getBuildOptions()))));
+            throw new \InvalidArgumentException(sprintf("You must include one or more of the following build options:\n--%s\n\nSee this task's help page for more information:\n\n  php symfony help doctrine:build", join(', --', array_keys($this->getBuildOptions()))));
         }
 
         if (self::BUILD_DB == (self::BUILD_DB & $mode)) {
-            $task = new sfDoctrineDropDbTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineDropDbTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
-            $ret = $task->run(array(), array('no-confirmation' => $options['no-confirmation']));
+            $ret = $task->run([], ['no-confirmation' => $options['no-confirmation']]);
 
             if ($ret) {
                 return $ret;
             }
 
-            $task = new sfDoctrineBuildDbTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineBuildDbTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -147,7 +147,7 @@ protected function execute($arguments = array(), $options = array())
         }
 
         if (self::BUILD_MODEL == (self::BUILD_MODEL & $mode)) {
-            $task = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -158,7 +158,7 @@ protected function execute($arguments = array(), $options = array())
         }
 
         if (self::BUILD_FORMS == (self::BUILD_FORMS & $mode)) {
-            $task = new sfDoctrineBuildFormsTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineBuildFormsTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -169,7 +169,7 @@ protected function execute($arguments = array(), $options = array())
         }
 
         if (self::BUILD_FILTERS == (self::BUILD_FILTERS & $mode)) {
-            $task = new sfDoctrineBuildFiltersTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineBuildFiltersTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -180,7 +180,7 @@ protected function execute($arguments = array(), $options = array())
         }
 
         if (self::BUILD_SQL == (self::BUILD_SQL & $mode)) {
-            $task = new sfDoctrineBuildSqlTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineBuildSqlTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -191,7 +191,7 @@ protected function execute($arguments = array(), $options = array())
         }
 
         if ($options['and-migrate']) {
-            $task = new sfDoctrineMigrateTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineMigrateTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -200,7 +200,7 @@ protected function execute($arguments = array(), $options = array())
                 return $ret;
             }
         } elseif (self::BUILD_DB == (self::BUILD_DB & $mode)) {
-            $task = new sfDoctrineInsertSqlTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineInsertSqlTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
             $ret = $task->run();
@@ -211,14 +211,14 @@ protected function execute($arguments = array(), $options = array())
         }
 
         if (count($options['and-load']) || count($options['and-append'])) {
-            $task = new sfDoctrineDataLoadTask($this->dispatcher, $this->formatter);
+            $task = new \sfDoctrineDataLoadTask($this->dispatcher, $this->formatter);
             $task->setCommandApplication($this->commandApplication);
             $task->setConfiguration($this->configuration);
 
             if (count($options['and-load'])) {
-                $ret = $task->run(array(
-                    'dir_or_file' => in_array(array(), $options['and-load'], true) ? null : $options['and-load'],
-                ));
+                $ret = $task->run([
+                    'dir_or_file' => in_array([], $options['and-load'], true) ? null : $options['and-load'],
+                ]);
 
                 if ($ret) {
                     return $ret;
@@ -226,11 +226,11 @@ protected function execute($arguments = array(), $options = array())
             }
 
             if (count($options['and-append'])) {
-                $ret = $task->run(array(
-                    'dir_or_file' => in_array(array(), $options['and-append'], true) ? null : $options['and-append'],
-                ), array(
+                $ret = $task->run([
+                    'dir_or_file' => in_array([], $options['and-append'], true) ? null : $options['and-append'],
+                ], [
                     'append' => true,
-                ));
+                ]);
 
                 if ($ret) {
                     return $ret;
@@ -246,7 +246,7 @@ protected function execute($arguments = array(), $options = array())
      *
      * @return int
      */
-    protected function calculateMode($options = array())
+    protected function calculateMode($options = [])
     {
         $mode = 0;
         foreach ($this->getBuildOptions() as $name => $value) {
@@ -265,7 +265,7 @@ protected function calculateMode($options = array())
      */
     protected function getBuildOptions()
     {
-        $options = array();
+        $options = [];
         foreach ($this->options as $option) {
             if (defined($constant = __CLASS__.'::OPTION_'.str_replace('-', '_', strtoupper($option->getName())))) {
                 $options[$option->getName()] = constant($constant);
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
index 9632a5e71..4e4099a7c 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,15 +18,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineCleanModelFilesTask extends sfDoctrineBaseTask
+class sfDoctrineCleanModelFilesTask extends \sfDoctrineBaseTask
 {
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('no-confirmation', null, \sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
+        ]);
 
-        $this->aliases = array('doctrine:clean');
+        $this->aliases = ['doctrine:clean'];
         $this->namespace = 'doctrine';
         $this->name = 'clean-model-files';
         $this->briefDescription = 'Delete all generated model classes for models which no longer exist in your YAML schema';
@@ -39,14 +40,14 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $config = $this->getCliConfig();
         $changed = false;
 
-        $deleteModelFiles = new sfDoctrineDeleteModelFilesTask($this->dispatcher, $this->formatter);
+        $deleteModelFiles = new \sfDoctrineDeleteModelFilesTask($this->dispatcher, $this->formatter);
         $deleteModelFiles->setCommandApplication($this->commandApplication);
         $deleteModelFiles->setConfiguration($this->configuration);
 
@@ -54,19 +55,19 @@ protected function execute($arguments = array(), $options = array())
 
         // remove any models present in the filesystem but not in the yaml schema
         if ($modelsToRemove = array_diff($this->getFileModels($config['models_path']), array_keys($yamlSchema))) {
-            $deleteModelFiles->run($modelsToRemove, array('no-confirmation' => $options['no-confirmation']));
+            $deleteModelFiles->run($modelsToRemove, ['no-confirmation' => $options['no-confirmation']]);
             $changed = true;
         }
 
         // remove form classes whose generation is disabled
         foreach ($yamlSchema as $model => $definition) {
             if (isset($definition['options']['symfony']['form']) && !$definition['options']['symfony']['form'] && class_exists($model.'Form')) {
-                $deleteModelFiles->run(array($model), array('suffix' => array('Form'), 'no-confirmation' => $options['no-confirmation']));
+                $deleteModelFiles->run([$model], ['suffix' => ['Form'], 'no-confirmation' => $options['no-confirmation']]);
                 $changed = true;
             }
 
             if (isset($definition['options']['symfony']['filter']) && !$definition['options']['symfony']['filter'] && class_exists($model.'FormFilter')) {
-                $deleteModelFiles->run(array($model), array('suffix' => array('FormFilter'), 'no-confirmation' => $options['no-confirmation']));
+                $deleteModelFiles->run([$model], ['suffix' => ['FormFilter'], 'no-confirmation' => $options['no-confirmation']]);
                 $changed = true;
             }
         }
@@ -95,7 +96,7 @@ protected function getYamlModels($yamlSchemaPath)
      */
     protected function getYamlSchema($yamlSchemaPath)
     {
-        return (array) sfYaml::load($this->prepareSchemaFile($yamlSchemaPath));
+        return (array) \sfYaml::load($this->prepareSchemaFile($yamlSchemaPath));
     }
 
     /**
@@ -105,8 +106,8 @@ protected function getYamlSchema($yamlSchemaPath)
      */
     protected function getFileModels($modelsPath)
     {
-        Doctrine_Core::loadModels($modelsPath);
+        \Doctrine_Core::loadModels($modelsPath);
 
-        return Doctrine_Core::getLoadedModels();
+        return \Doctrine_Core::getLoadedModels();
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
index ebfed326f..3ed5fc7df 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,22 +18,22 @@
  *
  * @version    SVN: $Id: sfDoctrineCompileTask.class.php 105 2012-03-22 16:26:34Z jtamarelle $
  */
-class sfDoctrineCompileTask extends sfDoctrineBaseTask
+class sfDoctrineCompileTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('database', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'A specific database'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('database', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'A specific database'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('no-confirmation', null, \sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'compile';
@@ -47,13 +47,13 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
-        $compiledFile = sfConfig::get('sf_cache_dir').'/doctrine.compiled.php';
+        $compiledFile = \sfConfig::get('sf_cache_dir').'/doctrine.compiled.php';
 
         if (file_exists($compiledFile)) {
             $this->logSection('error', $compiledFile.' already exists', null, 'ERROR');
@@ -62,7 +62,7 @@ protected function execute($arguments = array(), $options = array())
             return;
         }
 
-        $drivers = array();
+        $drivers = [];
         foreach ($databaseManager->getNames() as $name) {
             $drivers[] = strtolower($databaseManager->getDatabase($name)->getDoctrineConnection()->getDriverName());
         }
@@ -70,7 +70,7 @@ protected function execute($arguments = array(), $options = array())
 
         $this->logSection('compile', 'Included drivers: '.implode(', ', $drivers));
 
-        Doctrine_Core::compile($compiledFile, $drivers);
+        \Doctrine_Core::compile($compiledFile, $drivers);
 
         $this->logSection('file+', $compiledFile);
     }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
index d6cd89407..320cb267c 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,25 +16,25 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineConfigureDatabaseTask extends sfBaseTask
+class sfDoctrineConfigureDatabaseTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('dsn', sfCommandArgument::REQUIRED, 'The database dsn'),
-            new sfCommandArgument('username', sfCommandArgument::OPTIONAL, 'The database username', 'root'),
-            new sfCommandArgument('password', sfCommandArgument::OPTIONAL, 'The database password'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_OPTIONAL, 'The environment', 'all'),
-            new sfCommandOption('name', null, sfCommandOption::PARAMETER_OPTIONAL, 'The connection name', 'doctrine'),
-            new sfCommandOption('class', null, sfCommandOption::PARAMETER_OPTIONAL, 'The database class name', 'sfDoctrineDatabase'),
-            new sfCommandOption('app', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('dsn', \sfCommandArgument::REQUIRED, 'The database dsn'),
+            new \sfCommandArgument('username', \sfCommandArgument::OPTIONAL, 'The database username', 'root'),
+            new \sfCommandArgument('password', \sfCommandArgument::OPTIONAL, 'The database password'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The environment', 'all'),
+            new \sfCommandOption('name', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The connection name', 'doctrine'),
+            new \sfCommandOption('class', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The database class name', 'sfDoctrineDatabase'),
+            new \sfCommandOption('app', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
+        ]);
 
         $this->namespace = 'configure';
         $this->name = 'database';
@@ -62,24 +63,24 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         // update databases.yml
         if (null !== $options['app']) {
-            $file = sfConfig::get('sf_apps_dir').'/'.$options['app'].'/config/databases.yml';
+            $file = \sfConfig::get('sf_apps_dir').'/'.$options['app'].'/config/databases.yml';
         } else {
-            $file = sfConfig::get('sf_config_dir').'/databases.yml';
+            $file = \sfConfig::get('sf_config_dir').'/databases.yml';
         }
 
-        $config = file_exists($file) ? sfYaml::load($file) : array();
+        $config = file_exists($file) ? \sfYaml::load($file) : [];
 
-        $config[$options['env']][$options['name']] = array(
+        $config[$options['env']][$options['name']] = [
             'class' => $options['class'],
-            'param' => array_merge(isset($config[$options['env']][$options['name']]['param']) ? $config[$options['env']][$options['name']]['param'] : array(), array('dsn' => $arguments['dsn'], 'username' => $arguments['username'], 'password' => $arguments['password'])),
-        );
+            'param' => array_merge(isset($config[$options['env']][$options['name']]['param']) ? $config[$options['env']][$options['name']]['param'] : [], ['dsn' => $arguments['dsn'], 'username' => $arguments['username'], 'password' => $arguments['password']]),
+        ];
 
-        file_put_contents($file, sfYaml::dump($config, 4));
+        file_put_contents($file, \sfYaml::dump($config, 4));
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
index d9b21ee03..30280bc8a 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,19 +18,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineCreateModelTables extends sfDoctrineBaseTask
+class sfDoctrineCreateModelTables extends \sfDoctrineBaseTask
 {
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('models', sfCommandArgument::IS_ARRAY, 'The list of models', array()),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('models', \sfCommandArgument::IS_ARRAY, 'The list of models', []),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', 'frontend'),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('skip-build', null, sfCommandOption::PARAMETER_NONE, 'Skip the doctrine:build-model task.'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', 'frontend'),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('skip-build', null, \sfCommandOption::PARAMETER_NONE, 'Skip the doctrine:build-model task.'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'create-model-tables';
@@ -42,47 +43,47 @@ protected function configure()
 EOF;
     }
 
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
         if (!$options['skip-build']) {
-            $buildModel = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
+            $buildModel = new \sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
             $buildModel->setCommandApplication($this->commandApplication);
             $buildModel->setConfiguration($this->configuration);
             $buildModel->run();
         }
 
-        $connections = array();
+        $connections = [];
         $models = $arguments['models'];
         foreach ($models as $key => $model) {
             $model = trim($model);
-            $conn = Doctrine_Core::getTable($model)->getConnection();
+            $conn = \Doctrine_Core::getTable($model)->getConnection();
             $connections[$conn->getName()][] = $model;
         }
 
         foreach ($connections as $name => $models) {
             $this->logSection('doctrine', 'dropping model tables for connection "'.$name.'"');
 
-            $conn = Doctrine_Manager::getInstance()->getConnection($name);
+            $conn = \Doctrine_Manager::getInstance()->getConnection($name);
             $models = $conn->unitOfWork->buildFlushTree($models);
             $models = array_reverse($models);
 
             foreach ($models as $model) {
-                $tableName = Doctrine_Core::getTable($model)->getOption('tableName');
+                $tableName = \Doctrine_Core::getTable($model)->getOption('tableName');
 
                 $this->logSection('doctrine', 'dropping table "'.$tableName.'"');
 
                 try {
                     $conn->export->dropTable($tableName);
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     $this->logSection('doctrine', 'dropping table failed: '.$e->getMessage());
                 }
             }
 
             $this->logSection('doctrine', 'recreating tables for models');
 
-            Doctrine_Core::createTablesFromArray($models);
+            \Doctrine_Core::createTablesFromArray($models);
         }
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
index 55d7bdfc7..11cef04c1 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,21 +19,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineDataDumpTask extends sfDoctrineBaseTask
+class sfDoctrineDataDumpTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('target', sfCommandArgument::OPTIONAL, 'The target filename'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('target', \sfCommandArgument::OPTIONAL, 'The target filename'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'data-dump';
@@ -54,16 +54,16 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $config = $this->getCliConfig();
 
-        $args = array(
+        $args = [
             'data_fixtures_path' => $config['data_fixtures_path'][0],
-        );
+        ];
 
         if (!is_dir($args['data_fixtures_path'])) {
             $this->getFilesystem()->mkdirs($args['data_fixtures_path']);
@@ -72,7 +72,7 @@ protected function execute($arguments = array(), $options = array())
         if ($arguments['target']) {
             $filename = $arguments['target'];
 
-            if (!sfToolkit::isPathAbsolute($filename)) {
+            if (!\sfToolkit::isPathAbsolute($filename)) {
                 $filename = $args['data_fixtures_path'].'/'.$filename;
             }
 
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
index 8ef11f564..26c741e3e 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,23 +19,23 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineDataLoadTask extends sfDoctrineBaseTask
+class sfDoctrineDataLoadTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('dir_or_file', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'Directory or file to load'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('dir_or_file', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'Directory or file to load'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('append', null, sfCommandOption::PARAMETER_NONE, 'Don\'t delete current data in the database'),
-            new sfCommandOption('charset', null, sfCommandOption::PARAMETER_OPTIONAL, 'Specify charset'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('append', null, \sfCommandOption::PARAMETER_NONE, 'Don\'t delete current data in the database'),
+            new \sfCommandOption('charset', null, \sfCommandOption::PARAMETER_OPTIONAL, 'Specify charset'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'data-load';
@@ -61,11 +61,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
         if (!count($arguments['dir_or_file'])) {
             // pull default from CLI config array
@@ -73,11 +73,11 @@ protected function execute($arguments = array(), $options = array())
             $arguments['dir_or_file'] = $config['data_fixtures_path'];
         }
 
-        $doctrineArguments = array(
+        $doctrineArguments = [
             'data_fixtures_path' => $arguments['dir_or_file'],
             'append' => $options['append'],
             'charset' => $options['charset'],
-        );
+        ];
 
         foreach ($arguments['dir_or_file'] as $target) {
             $this->logSection('doctrine', sprintf('Loading data fixtures from "%s"', $target));
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
index ba683c6b9..03327aa0c 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,20 +18,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineDeleteModelFilesTask extends sfDoctrineBaseTask
+class sfDoctrineDeleteModelFilesTask extends \sfDoctrineBaseTask
 {
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED | sfCommandArgument::IS_ARRAY, 'The name of the model you wish to delete all related files for.'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED | \sfCommandArgument::IS_ARRAY, 'The name of the model you wish to delete all related files for.'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
-            new sfCommandOption('prefix', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Class prefix to remove'),
-            new sfCommandOption('suffix', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Class suffix to remove'),
-            new sfCommandOption('extension', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Filename extension to remove'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('no-confirmation', null, \sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
+            new \sfCommandOption('prefix', null, \sfCommandOption::PARAMETER_REQUIRED | \sfCommandOption::IS_ARRAY, 'Class prefix to remove'),
+            new \sfCommandOption('suffix', null, \sfCommandOption::PARAMETER_REQUIRED | \sfCommandOption::IS_ARRAY, 'Class suffix to remove'),
+            new \sfCommandOption('extension', null, \sfCommandOption::PARAMETER_REQUIRED | \sfCommandOption::IS_ARRAY, 'Filename extension to remove'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'delete-model-files';
@@ -45,36 +46,36 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $paths = array_merge(
-            array(
-                sfConfig::get('sf_lib_dir').'/model/doctrine',
-                sfConfig::get('sf_lib_dir').'/form/doctrine',
-                sfConfig::get('sf_lib_dir').'/filter/doctrine',
-            ),
+            [
+                \sfConfig::get('sf_lib_dir').'/model/doctrine',
+                \sfConfig::get('sf_lib_dir').'/form/doctrine',
+                \sfConfig::get('sf_lib_dir').'/filter/doctrine',
+            ],
             $this->configuration->getPluginSubPaths('/lib/model/doctrine'),
             $this->configuration->getPluginSubPaths('/lib/form/doctrine'),
             $this->configuration->getPluginSubPaths('/lib/filter/doctrine')
         );
 
-        $prefixPattern = $this->valuesToRegex($options['prefix'] ? $options['prefix'] : array('', 'Base', 'Plugin'));
-        $suffixPattern = $this->valuesToRegex($options['suffix'] ? $options['suffix'] : array('', 'Table', 'Form', 'FormFilter'));
-        $extensionPattern = $this->valuesToRegex($options['extension'] ? $options['extension'] : array('.php', '.class.php'));
+        $prefixPattern = $this->valuesToRegex($options['prefix'] ? $options['prefix'] : ['', 'Base', 'Plugin']);
+        $suffixPattern = $this->valuesToRegex($options['suffix'] ? $options['suffix'] : ['', 'Table', 'Form', 'FormFilter']);
+        $extensionPattern = $this->valuesToRegex($options['extension'] ? $options['extension'] : ['.php', '.class.php']);
 
         $total = 0;
 
         foreach ($arguments['name'] as $modelName) {
-            $finder = sfFinder::type('file')->name('/^'.$prefixPattern.$modelName.$suffixPattern.$extensionPattern.'$/');
+            $finder = \sfFinder::type('file')->name('/^'.$prefixPattern.$modelName.$suffixPattern.$extensionPattern.'$/');
             $files = $finder->in($paths);
 
             if ($files) {
                 if (!$options['no-confirmation'] && !$this->askConfirmation(array_merge(
-                    array('The following '.$modelName.' files will be deleted:', ''),
-                    array_map(function ($v) { return ' - '.sfDebug::shortenFilePath($v); }, $files),
-                    array('', 'Continue? (y/N)')
+                    ['The following '.$modelName.' files will be deleted:', ''],
+                    array_map(function ($v) { return ' - '.\sfDebug::shortenFilePath($v); }, $files),
+                    ['', 'Continue? (y/N)']
                 ), 'QUESTION_LARGE', false)) {
                     $this->logSection('doctrine', 'Aborting delete of "'.$modelName.'" files');
 
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
index b2760dadc..b427e2104 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,24 +19,24 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineDqlTask extends sfDoctrineBaseTask
+class sfDoctrineDqlTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('dql_query', sfCommandArgument::REQUIRED, 'The DQL query to execute', null),
-            new sfCommandArgument('parameter', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'Query parameter'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('show-sql', null, sfCommandOption::PARAMETER_NONE, 'Show the sql that would be executed'),
-            new sfCommandOption('table', null, sfCommandOption::PARAMETER_NONE, 'Return results in table format'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('dql_query', \sfCommandArgument::REQUIRED, 'The DQL query to execute', null),
+            new \sfCommandArgument('parameter', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'Query parameter'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('show-sql', null, \sfCommandOption::PARAMETER_NONE, 'Show the sql that would be executed'),
+            new \sfCommandOption('table', null, \sfCommandOption::PARAMETER_NONE, 'Return results in table format'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'dql';
@@ -59,15 +59,15 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
         $dql = $arguments['dql_query'];
 
-        $q = Doctrine_Query::create()
+        $q = \Doctrine_Query::create()
             ->parseDqlQuery($dql)
         ;
 
@@ -84,14 +84,14 @@ protected function execute($arguments = array(), $options = array())
             if (!$options['table']) {
                 $results = $q->fetchArray($arguments['parameter']);
 
-                $this->log(array(
+                $this->log([
                     sprintf('found %s results', number_format($count)),
-                    sfYaml::dump($results, 4),
-                ));
+                    \sfYaml::dump($results, 4),
+                ]);
             } else {
-                $results = $q->execute($arguments['parameter'], Doctrine_Core::HYDRATE_SCALAR);
+                $results = $q->execute($arguments['parameter'], \Doctrine_Core::HYDRATE_SCALAR);
 
-                $headers = array();
+                $headers = [];
 
                 // calculate lengths
                 foreach ($results as $result) {
@@ -117,7 +117,7 @@ protected function execute($arguments = array(), $options = array())
                     $div .= str_repeat('-', $length + 2).'+';
                 }
 
-                $this->log(array($div, $hdr, $div));
+                $this->log([$div, $hdr, $div]);
 
                 // print results
                 foreach ($results as $result) {
@@ -149,7 +149,7 @@ protected function execute($arguments = array(), $options = array())
     /**
      * Renders the supplied value.
      *
-     * @param string|null $value
+     * @param \string|null $value
      *
      * @return string
      */
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
index be555f57e..a7c69e875 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,22 +19,22 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineDropDbTask extends sfDoctrineBaseTask
+class sfDoctrineDropDbTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('database', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'A specific database'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('database', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'A specific database'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('no-confirmation', null, \sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'drop-db';
@@ -58,21 +58,21 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $databases = $this->getDoctrineDatabases($databaseManager, count($arguments['database']) ? $arguments['database'] : null);
 
-        $environment = $this->configuration instanceof sfApplicationConfiguration ? $this->configuration->getEnvironment() : 'all';
+        $environment = $this->configuration instanceof \sfApplicationConfiguration ? $this->configuration->getEnvironment() : 'all';
 
         if (
             !$options['no-confirmation']
             && !$this->askConfirmation(array_merge(
-                array(sprintf('This command will remove all data in the following "%s" connection(s):', $environment), ''),
+                [sprintf('This command will remove all data in the following "%s" connection(s):', $environment), ''],
                 array_map(function ($v) { return ' - '.$v; }, array_keys($databases)),
-                array('', 'Are you sure you want to proceed? (y/N)')
+                ['', 'Are you sure you want to proceed? (y/N)']
             ), 'QUESTION_LARGE', false)
         ) {
             $this->logSection('doctrine', 'task aborted');
@@ -85,7 +85,7 @@ protected function execute($arguments = array(), $options = array())
 
             try {
                 $database->getDoctrineConnection()->dropDatabase();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->logSection('doctrine', $e->getMessage(), null, 'ERROR');
             }
         }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
index 591acdcd5..9f090d835 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,26 +18,26 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateAdminTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateAdminTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('route_or_model', sfCommandArgument::REQUIRED, 'The route name or the model class'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('module', null, sfCommandOption::PARAMETER_REQUIRED, 'The module name', null),
-            new sfCommandOption('theme', null, sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'admin'),
-            new sfCommandOption('singular', null, sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
-            new sfCommandOption('plural', null, sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('actions-base-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('route_or_model', \sfCommandArgument::REQUIRED, 'The route name or the model class'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('module', null, \sfCommandOption::PARAMETER_REQUIRED, 'The module name', null),
+            new \sfCommandOption('theme', null, \sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'admin'),
+            new \sfCommandOption('singular', null, \sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
+            new \sfCommandOption('plural', null, \sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('actions-base-class', null, \sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-admin';
@@ -71,9 +72,9 @@ class: sfDoctrineRouteCollection
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         // get configuration for the given route
         if (false !== ($route = $this->getRouteFromName($arguments['route_or_model']))) {
@@ -85,17 +86,17 @@ protected function execute($arguments = array(), $options = array())
 
         // is it a model class name
         if (!class_exists($arguments['route_or_model'])) {
-            throw new sfCommandException(sprintf('The route "%s" does not exist and there is no "%s" class.', $arguments['route_or_model'], $arguments['route_or_model']));
+            throw new \sfCommandException(sprintf('The route "%s" does not exist and there is no "%s" class.', $arguments['route_or_model'], $arguments['route_or_model']));
         }
 
-        $r = new ReflectionClass($arguments['route_or_model']);
+        $r = new \ReflectionClass($arguments['route_or_model']);
         if (!$r->isSubclassOf('Doctrine_Record')) {
-            throw new sfCommandException(sprintf('"%s" is not a Doctrine class.', $arguments['route_or_model']));
+            throw new \sfCommandException(sprintf('"%s" is not a Doctrine class.', $arguments['route_or_model']));
         }
 
         // create a route
         $model = $arguments['route_or_model'];
-        $name = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $model));
+        $name = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\\1_\\2', $model));
 
         if (isset($options['module'])) {
             $route = $this->getRouteFromName($name);
@@ -104,13 +105,13 @@ protected function execute($arguments = array(), $options = array())
             }
         }
 
-        $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
+        $routing = \sfConfig::get('sf_app_config_dir').'/routing.yml';
         $content = file_get_contents($routing);
-        $routesArray = sfYaml::load($content);
+        $routesArray = \sfYaml::load($content);
 
         if (!isset($routesArray[$name])) {
-            $databaseManager = new sfDatabaseManager($this->configuration);
-            $primaryKey = Doctrine_Core::getTable($model)->getIdentifier();
+            $databaseManager = new \sfDatabaseManager($this->configuration);
+            $primaryKey = \Doctrine_Core::getTable($model)->getIdentifier();
             $module = $options['module'] ? $options['module'] : $name;
             $content = sprintf(<<<'EOF'
 %s:
@@ -129,7 +130,7 @@ class: sfDoctrineRouteCollection
             $this->logSection('file+', $routing);
 
             if (false === file_put_contents($routing, $content)) {
-                throw new sfCommandException(sprintf('Unable to write to file, %s.', $routing));
+                throw new \sfCommandException(sprintf('Unable to write to file, %s.', $routing));
             }
         }
 
@@ -143,21 +144,21 @@ protected function generateForRoute($arguments, $options)
     {
         $routeOptions = $arguments['route']->getOptions();
 
-        if (!$arguments['route'] instanceof sfDoctrineRouteCollection) {
-            throw new sfCommandException(sprintf('The route "%s" is not a Doctrine collection route.', $arguments['route_name']));
+        if (!$arguments['route'] instanceof \sfDoctrineRouteCollection) {
+            throw new \sfCommandException(sprintf('The route "%s" is not a Doctrine collection route.', $arguments['route_name']));
         }
 
         $module = $routeOptions['module'];
         $model = $routeOptions['model'];
 
         // execute the doctrine:generate-module task
-        $task = new sfDoctrineGenerateModuleTask($this->dispatcher, $this->formatter);
+        $task = new \sfDoctrineGenerateModuleTask($this->dispatcher, $this->formatter);
         $task->setCommandApplication($this->commandApplication);
         $task->setConfiguration($this->configuration);
 
         $this->logSection('app', sprintf('Generating admin module "%s" for model "%s"', $module, $model));
 
-        return $task->run(array($arguments['application'], $module, $model), array(
+        return $task->run([$arguments['application'], $module, $model], [
             'theme' => $options['theme'],
             'route-prefix' => $routeOptions['name'],
             'with-doctrine-route' => true,
@@ -166,12 +167,12 @@ protected function generateForRoute($arguments, $options)
             'singular' => $options['singular'],
             'plural' => $options['plural'],
             'actions-base-class' => $options['actions-base-class'],
-        ));
+        ]);
     }
 
     protected function getRouteFromName($name)
     {
-        $config = new sfRoutingConfigHandler();
+        $config = new \sfRoutingConfigHandler();
         $routes = $config->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
 
         if (isset($routes[$name])) {
@@ -192,7 +193,7 @@ protected function getRouteFromName($name)
      */
     protected function checkRoute($route, $model, $module)
     {
-        if ($route instanceof sfDoctrineRouteCollection) {
+        if ($route instanceof \sfDoctrineRouteCollection) {
             $options = $route->getOptions();
 
             return $model == $options['model'] && $module == $options['module'];
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
index 17ae5faaa..cd9907871 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,22 +19,22 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateMigrationTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateMigrationTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The name of the migration'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED, 'The name of the migration'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('editor-cmd', null, sfCommandOption::PARAMETER_REQUIRED, 'Open script with this command upon creation'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('editor-cmd', null, \sfCommandOption::PARAMETER_REQUIRED, 'Open script with this command upon creation'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-migration';
@@ -53,11 +53,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $config = $this->getCliConfig();
 
         $this->logSection('doctrine', sprintf('generating migration class named "%s"', $arguments['name']));
@@ -66,18 +66,18 @@ protected function execute($arguments = array(), $options = array())
             $this->getFilesystem()->mkdirs($config['migrations_path']);
         }
 
-        $this->callDoctrineCli('generate-migration', array('name' => $arguments['name']));
+        $this->callDoctrineCli('generate-migration', ['name' => $arguments['name']]);
 
-        $finder = sfFinder::type('file')->sort_by_name()->name('*.php');
+        $finder = \sfFinder::type('file')->sort_by_name()->name('*.php');
         if ($files = $finder->in($config['migrations_path'])) {
             $file = array_pop($files);
 
             $contents = file_get_contents($file);
-            $contents = strtr(sfToolkit::stripComments($contents), array(
+            $contents = strtr(\sfToolkit::stripComments($contents), [
                 "{\n\n" => "{\n",
                 "\n}" => "\n}\n",
                 '    ' => '  ',
-            ));
+            ]);
             file_put_contents($file, $contents);
 
             if (isset($options['editor-cmd'])) {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
index 3b4bce034..ca325c0ed 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateMigrationsDbTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateMigrationsDbTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-migrations-db';
@@ -44,11 +44,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $config = $this->getCliConfig();
 
         $this->logSection('doctrine', 'generating migration classes from database');
@@ -57,8 +57,8 @@ protected function execute($arguments = array(), $options = array())
             $this->getFilesystem()->mkdirs($config['migrations_path']);
         }
 
-        $this->callDoctrineCli('generate-migrations-db', array(
+        $this->callDoctrineCli('generate-migrations-db', [
             'yaml_schema_path' => $this->prepareSchemaFile($config['yaml_schema_path']),
-        ));
+        ]);
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
index 43178c255..231ca0672 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateMigrationsDiffTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateMigrationsDiffTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-migrations-diff';
@@ -44,11 +44,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $config = $this->getCliConfig();
 
         $this->logSection('doctrine', 'generating migration diff');
@@ -57,10 +57,10 @@ protected function execute($arguments = array(), $options = array())
             $this->getFilesystem()->mkdirs($config['migrations_path']);
         }
 
-        spl_autoload_register(array('Doctrine_Core', 'modelsAutoload'));
+        spl_autoload_register(['Doctrine_Core', 'modelsAutoload']);
 
-        $this->callDoctrineCli('generate-migrations-diff', array(
+        $this->callDoctrineCli('generate-migrations-diff', [
             'yaml_schema_path' => $this->prepareSchemaFile($config['yaml_schema_path']),
-        ));
+        ]);
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
index a7caaf768..6027436c5 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateMigrationsModelsTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateMigrationsModelsTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-migrations-models';
@@ -44,11 +44,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $config = $this->getCliConfig();
 
         $this->logSection('doctrine', 'generating migration classes from models');
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
index 5599f5105..e8360e313 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,26 +18,26 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateModuleForRouteTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateModuleForRouteTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('route', sfCommandArgument::REQUIRED, 'The route name'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('theme', null, sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'default'),
-            new sfCommandOption('non-verbose-templates', null, sfCommandOption::PARAMETER_NONE, 'Generate non verbose templates'),
-            new sfCommandOption('singular', null, sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
-            new sfCommandOption('plural', null, sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('actions-base-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('route', \sfCommandArgument::REQUIRED, 'The route name'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('theme', null, \sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'default'),
+            new \sfCommandOption('non-verbose-templates', null, \sfCommandOption::PARAMETER_NONE, 'Generate non verbose templates'),
+            new \sfCommandOption('singular', null, \sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
+            new \sfCommandOption('plural', null, \sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('actions-base-class', null, \sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-module-for-route';
@@ -53,35 +54,35 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         // get configuration for the given route
-        $config = new sfRoutingConfigHandler();
+        $config = new \sfRoutingConfigHandler();
         $routes = $config->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
 
         if (!isset($routes[$arguments['route']])) {
-            throw new sfCommandException(sprintf('The route "%s" does not exist.', $arguments['route']));
+            throw new \sfCommandException(sprintf('The route "%s" does not exist.', $arguments['route']));
         }
 
         $routeOptions = $routes[$arguments['route']]->getOptions();
 
-        if (!$routes[$arguments['route']] instanceof sfDoctrineRouteCollection) {
-            throw new sfCommandException(sprintf('The route "%s" is not a Doctrine collection route.', $arguments['route']));
+        if (!$routes[$arguments['route']] instanceof \sfDoctrineRouteCollection) {
+            throw new \sfCommandException(sprintf('The route "%s" is not a Doctrine collection route.', $arguments['route']));
         }
 
         $module = $routeOptions['module'];
         $model = $routeOptions['model'];
 
         // execute the doctrine:generate-module task
-        $task = new sfDoctrineGenerateModuleTask($this->dispatcher, $this->formatter);
+        $task = new \sfDoctrineGenerateModuleTask($this->dispatcher, $this->formatter);
         $task->setCommandApplication($this->commandApplication);
         $task->setConfiguration($this->configuration);
 
         $this->logSection('app', sprintf('Generating module "%s" for model "%s"', $module, $model));
 
-        return $task->run(array($arguments['application'], $module, $model), array(
+        return $task->run([$arguments['application'], $module, $model], [
             'theme' => $options['theme'],
             'route-prefix' => $routeOptions['name'],
             'with-doctrine-route' => true,
@@ -90,6 +91,6 @@ protected function execute($arguments = array(), $options = array())
             'singular' => $options['singular'],
             'plural' => $options['plural'],
             'actions-base-class' => $options['actions-base-class'],
-        ));
+        ]);
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
index 3402cbbd9..8f8dee1fa 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,31 +18,31 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineGenerateModuleTask extends sfDoctrineBaseTask
+class sfDoctrineGenerateModuleTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('module', sfCommandArgument::REQUIRED, 'The module name'),
-            new sfCommandArgument('model', sfCommandArgument::REQUIRED, 'The model class name'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('theme', null, sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'default'),
-            new sfCommandOption('generate-in-cache', null, sfCommandOption::PARAMETER_NONE, 'Generate the module in cache'),
-            new sfCommandOption('non-verbose-templates', null, sfCommandOption::PARAMETER_NONE, 'Generate non verbose templates'),
-            new sfCommandOption('with-show', null, sfCommandOption::PARAMETER_NONE, 'Generate a show method'),
-            new sfCommandOption('singular', null, sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
-            new sfCommandOption('plural', null, sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
-            new sfCommandOption('route-prefix', null, sfCommandOption::PARAMETER_REQUIRED, 'The route prefix', null),
-            new sfCommandOption('with-doctrine-route', null, sfCommandOption::PARAMETER_NONE, 'Whether you will use a Doctrine route'),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('actions-base-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('module', \sfCommandArgument::REQUIRED, 'The module name'),
+            new \sfCommandArgument('model', \sfCommandArgument::REQUIRED, 'The model class name'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('theme', null, \sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'default'),
+            new \sfCommandOption('generate-in-cache', null, \sfCommandOption::PARAMETER_NONE, 'Generate the module in cache'),
+            new \sfCommandOption('non-verbose-templates', null, \sfCommandOption::PARAMETER_NONE, 'Generate non verbose templates'),
+            new \sfCommandOption('with-show', null, \sfCommandOption::PARAMETER_NONE, 'Generate a show method'),
+            new \sfCommandOption('singular', null, \sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
+            new \sfCommandOption('plural', null, \sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
+            new \sfCommandOption('route-prefix', null, \sfCommandOption::PARAMETER_REQUIRED, 'The route prefix', null),
+            new \sfCommandOption('with-doctrine-route', null, \sfCommandOption::PARAMETER_NONE, 'Whether you will use a Doctrine route'),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('actions-base-class', null, \sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'generate-module';
@@ -75,79 +76,79 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
-        $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
+        $properties = parse_ini_file(\sfConfig::get('sf_config_dir').'/properties.ini', true);
 
-        $this->constants = array(
+        $this->constants = [
             'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
             'APP_NAME' => $arguments['application'],
             'MODULE_NAME' => $arguments['module'],
             'UC_MODULE_NAME' => ucfirst($arguments['module']),
             'MODEL_CLASS' => $arguments['model'],
             'AUTHOR_NAME' => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
-        );
+        ];
 
         $method = $options['generate-in-cache'] ? 'executeInit' : 'executeGenerate';
 
         $this->{$method}($arguments, $options);
     }
 
-    protected function executeGenerate($arguments = array(), $options = array())
+    protected function executeGenerate($arguments = [], $options = [])
     {
         // generate module
-        $tmpDir = sfConfig::get('sf_cache_dir').DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.md5(uniqid(rand(), true));
-        $generatorManager = new sfGeneratorManager($this->configuration, $tmpDir);
-        $generatorManager->generate('sfDoctrineGenerator', array(
+        $tmpDir = \sfConfig::get('sf_cache_dir').DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.md5(uniqid(rand(), true));
+        $generatorManager = new \sfGeneratorManager($this->configuration, $tmpDir);
+        $generatorManager->generate('sfDoctrineGenerator', [
             'model_class' => $arguments['model'],
             'moduleName' => $arguments['module'],
             'theme' => $options['theme'],
             'non_verbose_templates' => $options['non-verbose-templates'],
             'with_show' => $options['with-show'],
-            'singular' => $options['singular'] ? $options['singular'] : sfInflector::underscore($arguments['model']),
-            'plural' => $options['plural'] ? $options['plural'] : sfInflector::underscore($arguments['model'].'s'),
+            'singular' => $options['singular'] ? $options['singular'] : \sfInflector::underscore($arguments['model']),
+            'plural' => $options['plural'] ? $options['plural'] : \sfInflector::underscore($arguments['model'].'s'),
             'route_prefix' => $options['route-prefix'],
             'with_doctrine_route' => $options['with-doctrine-route'],
             'actions_base_class' => $options['actions-base-class'],
-        ));
+        ]);
 
-        $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
+        $moduleDir = \sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
 
         // copy our generated module
-        $this->getFilesystem()->mirror($tmpDir.DIRECTORY_SEPARATOR.'auto'.ucfirst($arguments['module']), $moduleDir, sfFinder::type('any'));
+        $this->getFilesystem()->mirror($tmpDir.DIRECTORY_SEPARATOR.'auto'.ucfirst($arguments['module']), $moduleDir, \sfFinder::type('any'));
 
         if (!$options['with-show']) {
             $this->getFilesystem()->remove($moduleDir.'/templates/showSuccess.php');
         }
 
         // change module name
-        $finder = sfFinder::type('file')->name('*.php');
-        $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '', '', array('auto'.ucfirst($arguments['module']) => $arguments['module']));
+        $finder = \sfFinder::type('file')->name('*.php');
+        $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '', '', ['auto'.ucfirst($arguments['module']) => $arguments['module']]);
 
         // customize php and yml files
-        $finder = sfFinder::type('file')->name('*.php', '*.yml');
+        $finder = \sfFinder::type('file')->name('*.php', '*.yml');
         $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $this->constants);
 
         // create basic test
-        $this->getFilesystem()->copy(sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'task'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'skeleton'.DIRECTORY_SEPARATOR.'module'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'actionsTest.php', sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php');
+        $this->getFilesystem()->copy(\sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'task'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'skeleton'.DIRECTORY_SEPARATOR.'module'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'actionsTest.php', \sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php');
 
         // customize test file
-        $this->getFilesystem()->replaceTokens(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php', '##', '##', $this->constants);
+        $this->getFilesystem()->replaceTokens(\sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php', '##', '##', $this->constants);
 
         // delete temp files
-        $this->getFilesystem()->remove(sfFinder::type('any')->in($tmpDir));
+        $this->getFilesystem()->remove(\sfFinder::type('any')->in($tmpDir));
     }
 
-    protected function executeInit($arguments = array(), $options = array())
+    protected function executeInit($arguments = [], $options = [])
     {
-        $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
+        $moduleDir = \sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
 
         // create basic application structure
-        $finder = sfFinder::type('any')->discard('.sf');
+        $finder = \sfFinder::type('any')->discard('.sf');
         $dirs = $this->configuration->getGeneratorSkeletonDirs('sfDoctrineModule', $options['theme']);
 
         foreach ($dirs as $dir) {
@@ -177,13 +178,13 @@ protected function executeInit($arguments = array(), $options = array())
         }
 
         // create basic test
-        $this->getFilesystem()->copy(sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'task'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'skeleton'.DIRECTORY_SEPARATOR.'module'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'actionsTest.php', sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php');
+        $this->getFilesystem()->copy(\sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'task'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'skeleton'.DIRECTORY_SEPARATOR.'module'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'actionsTest.php', \sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php');
 
         // customize test file
-        $this->getFilesystem()->replaceTokens(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php', '##', '##', $this->constants);
+        $this->getFilesystem()->replaceTokens(\sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php', '##', '##', $this->constants);
 
         // customize php and yml files
-        $finder = sfFinder::type('file')->name('*.php', '*.yml');
+        $finder = \sfFinder::type('file')->name('*.php', '*.yml');
         $this->constants['CONFIG'] = sprintf(
             <<<'EOF'
     model_class:           %s
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
index 1cefab957..5f31a3302 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +19,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineInsertSqlTask extends sfDoctrineBaseTask
+class sfDoctrineInsertSqlTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'insert-sql';
@@ -46,17 +46,17 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('doctrine', 'creating tables');
 
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
         $config = $this->getCliConfig();
 
-        Doctrine_Core::loadModels($config['models_path'], Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
-        Doctrine_Core::createTablesFromArray(Doctrine_Core::getLoadedModels());
+        \Doctrine_Core::loadModels($config['models_path'], \Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        \Doctrine_Core::createTablesFromArray(\Doctrine_Core::getLoadedModels());
 
         $this->logSection('doctrine', 'created tables successfully');
     }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
index 526a541ef..71f08014d 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,24 +19,24 @@
  *
  * @version    SVN: $Id$
  */
-class sfDoctrineMigrateTask extends sfDoctrineBaseTask
+class sfDoctrineMigrateTask extends \sfDoctrineBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('version', sfCommandArgument::OPTIONAL, 'The version to migrate to'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('up', null, sfCommandOption::PARAMETER_NONE, 'Migrate up one version'),
-            new sfCommandOption('down', null, sfCommandOption::PARAMETER_NONE, 'Migrate down one version'),
-            new sfCommandOption('dry-run', null, sfCommandOption::PARAMETER_NONE, 'Do not persist migrations'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('version', \sfCommandArgument::OPTIONAL, 'The version to migrate to'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('up', null, \sfCommandOption::PARAMETER_NONE, 'Migrate up one version'),
+            new \sfCommandOption('down', null, \sfCommandOption::PARAMETER_NONE, 'Migrate down one version'),
+            new \sfCommandOption('dry-run', null, \sfCommandOption::PARAMETER_NONE, 'Do not persist migrations'),
+        ]);
 
         $this->namespace = 'doctrine';
         $this->name = 'migrate';
@@ -63,14 +63,14 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
         $config = $this->getCliConfig();
-        $migration = new Doctrine_Migration($config['migrations_path']);
+        $migration = new \Doctrine_Migration($config['migrations_path']);
         $from = $migration->getCurrentVersion();
 
         if (is_numeric($arguments['version'])) {
@@ -104,7 +104,7 @@ protected function execute($arguments = array(), $options = array())
                     $migration->migrate($i, $options['dry-run']);
                 }
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
         }
 
         // render errors
@@ -116,7 +116,7 @@ protected function execute($arguments = array(), $options = array())
                 }
             } else {
                 $this->logBlock(array_merge(
-                    array('The following errors occurred:', ''),
+                    ['The following errors occurred:', ''],
                     array_map(function ($e) { return ' - '.$e->getMessage(); }, $migration->getErrors())
                 ), 'ERROR_LARGE');
             }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
index 187326f08..f383dd327 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterDoctrine extends sfTester
+class sfTesterDoctrine extends \sfTester
 {
     /**
      * Prepares the tester.
@@ -43,18 +44,18 @@ public function initialize()
     public function check($model, $query, $value = true)
     {
         if (null === $query) {
-            $query = Doctrine_Core::getTable($model)
+            $query = \Doctrine_Core::getTable($model)
                 ->createQuery('a')
             ;
         }
 
         if (is_array($query)) {
             $conditions = $query;
-            $query = $query = Doctrine_Core::getTable($model)
+            $query = $query = \Doctrine_Core::getTable($model)
                 ->createQuery('a')
             ;
             foreach ($conditions as $column => $condition) {
-                $column = Doctrine_Core::getTable($model)->getFieldName($column);
+                $column = \Doctrine_Core::getTable($model)->getFieldName($column);
 
                 if (null === $condition) {
                     $query->andWhere('a.'.$column.' IS NULL');
@@ -64,9 +65,9 @@ public function check($model, $query, $value = true)
 
                 $operator = '=';
                 if (strlen($condition) && '!' == substr($condition, 0, 1)) {
-                    $operator = false !== strpos($condition, '%') ? 'NOT LIKE' : '!=';
+                    $operator =   str_contains($condition, '%') ? 'NOT LIKE' : '!=';
                     $condition = substr($condition, 1);
-                } elseif (false !== strpos($condition, '%')) {
+                } elseif (str_contains($condition, '%')) {
                     $operator = 'LIKE';
                 }
 
@@ -83,7 +84,7 @@ public function check($model, $query, $value = true)
         } elseif (is_int($value)) {
             $this->tester->is(count($objects), $value, sprintf('"%s" %s objects have been found', $value, $model));
         } else {
-            throw new InvalidArgumentException('The "check()" method does not takes this kind of argument.');
+            throw new \InvalidArgumentException('The "check()" method does not takes this kind of argument.');
         }
 
         return $this->getObjectToReturn();
@@ -97,13 +98,13 @@ public function check($model, $query, $value = true)
     public function debug($limit = null)
     {
         if (!$databaseManager = $this->browser->getContext()->getDatabaseManager()) {
-            throw new LogicConnection('The current context does not include a database manager.');
+            throw new \LogicConnection('The current context does not include a database manager.');
         }
 
-        $events = array();
+        $events = [];
         foreach ($databaseManager->getNames() as $name) {
             $database = $databaseManager->getDatabase($name);
-            if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler()) {
+            if ($database instanceof \sfDoctrineDatabase && $profiler = $database->getProfiler()) {
                 foreach ($profiler->getQueryExecutionEvents() as $event) {
                     $events[$event->getSequence()] = $event;
                 }
@@ -135,10 +136,10 @@ public function debug($limit = null)
                 || (isset($pattern) && $match == preg_match($pattern, $event->getQuery()))
                 || (isset($substring) && false !== stripos($event->getQuery(), $substring))
             ) {
-                $conn = $event->getInvoker() instanceof Doctrine_Connection ? $event->getInvoker() : $event->getInvoker()->getConnection();
+                $conn = $event->getInvoker() instanceof \Doctrine_Connection ? $event->getInvoker() : $event->getInvoker()->getConnection();
 
                 echo $event->getQuery()."\n";
-                echo '  Parameters: '.sfYaml::dump(sfDoctrineConnectionProfiler::fixParams($event->getParams()), 0)."\n";
+                echo '  Parameters: '.\sfYaml::dump(\sfDoctrineConnectionProfiler::fixParams($event->getParams()), 0)."\n";
                 echo '  Connection: '.$conn->getName()."\n";
                 echo '  Time:       '.number_format($event->getElapsedSecs(), 2)."s\n\n";
             }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
index da720236b..0359ce632 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorDoctrineChoice extends sfValidatorBase
+class sfValidatorDoctrineChoice extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -32,9 +32,9 @@ class sfValidatorDoctrineChoice extends sfValidatorBase
      *  * min:        The minimum number of values that need to be selected (this option is only active if multiple is true)
      *  * max:        The maximum number of values that need to be selected (this option is only active if multiple is true)
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('model');
         $this->addOption('query', null);
@@ -48,19 +48,19 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         if ($query = $this->getOption('query')) {
             $query = clone $query;
         } else {
-            $query = Doctrine_Core::getTable($this->getOption('model'))->createQuery();
+            $query = \Doctrine_Core::getTable($this->getOption('model'))->createQuery();
         }
 
         if ($this->getOption('multiple')) {
             if (!is_array($value)) {
-                $value = array($value);
+                $value = [$value];
             }
 
             if (isset($value[0]) && '' === $value[0]) {
@@ -70,23 +70,23 @@ protected function doClean($value)
             $count = count($value);
 
             if ($this->hasOption('min') && $count < $this->getOption('min')) {
-                throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
+                throw new \sfValidatorError($this, 'min', ['count' => $count, 'min' => $this->getOption('min')]);
             }
 
             if ($this->hasOption('max') && $count > $this->getOption('max')) {
-                throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
+                throw new \sfValidatorError($this, 'max', ['count' => $count, 'max' => $this->getOption('max')]);
             }
 
             $query->andWhereIn(sprintf('%s.%s', $query->getRootAlias(), $this->getColumn()), $value);
 
             if ($query->count() != count($value)) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         } else {
             $query->andWhere(sprintf('%s.%s = ?', $query->getRootAlias(), $this->getColumn()), $value);
 
             if (!$query->count()) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         }
 
@@ -102,7 +102,7 @@ protected function doClean($value)
      */
     protected function getColumn()
     {
-        $table = Doctrine_Core::getTable($this->getOption('model'));
+        $table = \Doctrine_Core::getTable($this->getOption('model'));
         if ($this->getOption('column')) {
             $columnName = $this->getOption('column');
         } else {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
index 08e24c8ab..7047ff3e8 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,7 +21,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorDoctrineUnique extends sfValidatorSchema
+class sfValidatorDoctrineUnique extends \sfValidatorSchema
 {
     /**
      * Constructor.
@@ -29,9 +29,9 @@ class sfValidatorDoctrineUnique extends sfValidatorSchema
      * @param array  An array of options
      * @param array  An array of error messages
      *
-     * @see sfValidatorSchema
+     * @see \sfValidatorSchema
      */
-    public function __construct($options = array(), $messages = array())
+    public function __construct($options = [], $messages = [])
     {
         parent::__construct(null, $options, $messages);
     }
@@ -49,9 +49,9 @@ public function __construct($options = array(), $messages = array())
      *  * connection:         The Doctrine connection to use (null by default)
      *  * throw_global_error: Whether to throw a global error (false by default) or an error tied to the first field related to the column option array
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('model');
         $this->addRequiredOption('column');
@@ -63,24 +63,24 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($values)
     {
         $originalValues = $values;
-        $table = Doctrine_Core::getTable($this->getOption('model'));
+        $table = \Doctrine_Core::getTable($this->getOption('model'));
         if (!is_array($this->getOption('column'))) {
-            $this->setOption('column', array($this->getOption('column')));
+            $this->setOption('column', [$this->getOption('column')]);
         }
 
         // if $values isn't an array, make it one
         if (!is_array($values)) {
             // use first column for key
             $columns = $this->getOption('column');
-            $values = array($columns[0] => $values);
+            $values = [$columns[0] => $values];
         }
 
-        $q = Doctrine_Core::getTable($this->getOption('model'))->createQuery('a');
+        $q = \Doctrine_Core::getTable($this->getOption('model'))->createQuery('a');
         foreach ($this->getOption('column') as $column) {
             $colName = $table->getColumnName($column);
             if (!array_key_exists($column, $values)) {
@@ -98,7 +98,7 @@ protected function doClean($values)
             return $originalValues;
         }
 
-        $error = new sfValidatorError($this, 'invalid', array('column' => implode(', ', $this->getOption('column'))));
+        $error = new \sfValidatorError($this, 'invalid', ['column' => implode(', ', $this->getOption('column'))]);
 
         if ($this->getOption('throw_global_error')) {
             throw $error;
@@ -106,7 +106,7 @@ protected function doClean($values)
 
         $columns = $this->getOption('column');
 
-        $errorSchema = new sfValidatorErrorSchema($this);
+        $errorSchema = new \sfValidatorErrorSchema($this);
         $errorSchema->addError($error, $columns[0]);
 
         throw $errorSchema;
@@ -115,11 +115,11 @@ protected function doClean($values)
     /**
      * Returns whether the object is being updated.
      *
-     * @param BaseObject  A Doctrine object
+     * @param \BaseObject  A Doctrine object
      * @param array       An array of values
      * @param bool     true if the object is being updated, false otherwise
      */
-    protected function isUpdate(Doctrine_Record $object, $values)
+    protected function isUpdate(\Doctrine_Record $object, $values)
     {
         // check each primary key column
         foreach ($this->getPrimaryKeys() as $column) {
@@ -139,12 +139,12 @@ protected function isUpdate(Doctrine_Record $object, $values)
     protected function getPrimaryKeys()
     {
         if (null === $this->getOption('primary_key')) {
-            $primaryKeys = Doctrine_Core::getTable($this->getOption('model'))->getIdentifier();
+            $primaryKeys = \Doctrine_Core::getTable($this->getOption('model'))->getIdentifier();
             $this->setOption('primary_key', $primaryKeys);
         }
 
         if (!is_array($this->getOption('primary_key'))) {
-            $this->setOption('primary_key', array($this->getOption('primary_key')));
+            $this->setOption('primary_key', [$this->getOption('primary_key')]);
         }
 
         return $this->getOption('primary_key');
diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
index 0c14c9bd0..43aa48d65 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,14 +17,14 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormDoctrineArrayChoice extends sfWidgetFormChoice
+class sfWidgetFormDoctrineArrayChoice extends \sfWidgetFormChoice
 {
     /**
-     * @see sfWidget
+     * @see \sfWidget
      */
-    public function __construct($options = array(), $attributes = array())
+    public function __construct($options = [], $attributes = [])
     {
-        $options['choices'] = array();
+        $options['choices'] = [];
 
         parent::__construct($options, $attributes);
     }
@@ -36,16 +36,16 @@ public function __construct($options = array(), $attributes = array())
      */
     public function getChoices()
     {
-        $choices = array();
+        $choices = [];
         if (false !== $this->getOption('add_empty')) {
             $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
         }
 
         $tableMethod = $this->getOption('table_method');
-        $table = Doctrine_Core::getTable($this->getOption('model'));
+        $table = \Doctrine_Core::getTable($this->getOption('model'));
 
         if (null !== $params = $this->getOption('table_method_params')) {
-            $choices += call_user_func_array(array($table, $tableMethod), (array) $params);
+            $choices += call_user_func_array([$table, $tableMethod], (array) $params);
         } else {
             $choices += $table->{$tableMethod}();
         }
@@ -65,9 +65,9 @@ public function getChoices()
      *                          If the option is not a Boolean, the value will be used as the text value
      *  * multiple:             true if the select tag must allow multiple selections (false by default)
      *
-     * @see sfWidgetFormChoice
+     * @see \sfWidgetFormChoice
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('model');
         $this->addRequiredOption('table_method');
diff --git a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
index 5bf5e9354..0625e4896 100644
--- a/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
+++ b/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Jonathan H. Wage <jonwage@gmail.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,14 +17,14 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormDoctrineChoice extends sfWidgetFormChoice
+class sfWidgetFormDoctrineChoice extends \sfWidgetFormChoice
 {
     /**
-     * @see sfWidget
+     * @see \sfWidget
      */
-    public function __construct($options = array(), $attributes = array())
+    public function __construct($options = [], $attributes = [])
     {
-        $options['choices'] = array();
+        $options['choices'] = [];
 
         parent::__construct($options, $attributes);
     }
@@ -36,30 +36,30 @@ public function __construct($options = array(), $attributes = array())
      */
     public function getChoices()
     {
-        $choices = array();
+        $choices = [];
         if (false !== $this->getOption('add_empty')) {
             $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
         }
 
         if (null === $this->getOption('table_method')) {
-            $query = null === $this->getOption('query') ? Doctrine_Core::getTable($this->getOption('model'))->createQuery() : $this->getOption('query');
+            $query = null === $this->getOption('query') ? \Doctrine_Core::getTable($this->getOption('model'))->createQuery() : $this->getOption('query');
             if ($order = $this->getOption('order_by')) {
                 $query->addOrderBy($order[0].' '.$order[1]);
             }
             $objects = $query->execute();
         } else {
             $tableMethod = $this->getOption('table_method');
-            $results = Doctrine_Core::getTable($this->getOption('model'))->{$tableMethod}();
+            $results = \Doctrine_Core::getTable($this->getOption('model'))->{$tableMethod}();
 
-            if ($results instanceof Doctrine_Query) {
+            if ($results instanceof \Doctrine_Query) {
                 $objects = $results->execute();
-            } elseif ($results instanceof Doctrine_Collection) {
+            } elseif ($results instanceof \Doctrine_Collection) {
                 $objects = $results;
-            } elseif ($results instanceof Doctrine_Record) {
-                $objects = new Doctrine_Collection($this->getOption('model'));
+            } elseif ($results instanceof \Doctrine_Record) {
+                $objects = new \Doctrine_Collection($this->getOption('model'));
                 $objects[] = $results;
             } else {
-                $objects = array();
+                $objects = [];
             }
         }
 
@@ -90,9 +90,9 @@ public function getChoices()
      *  * multiple:     true if the select tag must allow multiple selections
      *  * table_method: A method to return either a query, collection or single object
      *
-     * @see sfWidgetFormSelect
+     * @see \sfWidgetFormSelect
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('model');
         $this->addOption('add_empty', false);
diff --git a/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php b/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
index f3f3b3321..fc71ef959 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bin/coverage.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +15,7 @@
 
 require SYMFONY_LIB_DIR.'/util/sfFinder.class.php';
 
-$h = new lime_harness();
+$h = new \lime_harness();
 $h->base_dir = realpath(dirname(__FILE__).'/..');
 
 // unit tests
@@ -25,11 +26,11 @@
 $h->register_glob($h->base_dir.'/functional/*Test.php');
 $h->register_glob($h->base_dir.'/functional/*/*Test.php');
 
-$c = new lime_coverage($h);
+$c = new \lime_coverage($h);
 $c->extension = '.class.php';
 $c->verbose = false;
 $c->base_dir = realpath(dirname(__FILE__).'/../lib');
 
-$finder = sfFinder::type('file')->name('*.php')->prune('vendor')->prune('test')->prune('data');
+$finder = \sfFinder::type('file')->name('*.php')->prune('vendor')->prune('test')->prune('data');
 $c->register($finder->in($c->base_dir));
 $c->run();
diff --git a/lib/plugins/sfDoctrinePlugin/test/bin/prove.php b/lib/plugins/sfDoctrinePlugin/test/bin/prove.php
index 1a9f51a3a..5e7dfe610 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bin/prove.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bin/prove.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,14 +15,14 @@
 
 require SYMFONY_LIB_DIR.'/util/sfFinder.class.php';
 
-$h = new lime_harness();
+$h = new \lime_harness();
 $h->base_dir = realpath(dirname(__FILE__).'/..');
 
-$h->register(sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array(
+$h->register(\sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in([
     // unit tests
     $h->base_dir.'/unit',
     // functional tests
     $h->base_dir.'/functional',
-)));
+]));
 
 exit($h->run() ? 0 : 1);
diff --git a/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php b/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
index 046c1da15..a8bc90644 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bootstrap/functional.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,8 @@
 }
 
 include $root_dir.'/config/ProjectConfiguration.class.php';
-$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
-sfContext::createInstance($configuration);
+$configuration = \ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
+\sfContext::createInstance($configuration);
 
 // remove all cache
 sf_functional_test_shutdown();
@@ -29,9 +30,9 @@
 
 function sf_functional_test_shutdown_cleanup()
 {
-    sfToolkit::clearDirectory(sfConfig::get('sf_cache_dir'));
-    sfToolkit::clearDirectory(sfConfig::get('sf_log_dir'));
-    $databases = glob(sfConfig::get('sf_data_dir').'/*.sqlite');
+    \sfToolkit::clearDirectory(\sfConfig::get('sf_cache_dir'));
+    \sfToolkit::clearDirectory(\sfConfig::get('sf_log_dir'));
+    $databases = glob(\sfConfig::get('sf_data_dir').'/*.sqlite');
     foreach ($databases as $database) {
         unlink($database);
     }
@@ -42,7 +43,7 @@ function sf_functional_test_shutdown()
     // try/catch needed due to http://bugs.php.net/bug.php?id=33598
     try {
         sf_functional_test_shutdown_cleanup();
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
         echo $e.PHP_EOL;
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php b/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
index 8514daad2..ac47bb03c 100644
--- a/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
+++ b/lib/plugins/sfDoctrinePlugin/test/bootstrap/unit.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,7 +12,7 @@
 include dirname(__FILE__).'/../../../../../test/bootstrap/unit.php';
 
 include dirname(__FILE__).'/../../../../autoload/sfSimpleAutoload.class.php';
-$autoload = sfSimpleAutoload::getInstance(sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_doctrine_%s.data', md5(__FILE__)));
+$autoload = \sfSimpleAutoload::getInstance(sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_doctrine_%s.data', md5(__FILE__)));
 $autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib'));
 $autoload->register();
 
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
index 16e76d095..b8bc2a990 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/ActionRedirectTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$browser = new sfTestFunctional(new sfBrowser());
+$browser = new \sfTestFunctional(new \sfBrowser());
 
 $browser->get('/articles/redirectToShow')
     ->with('response')->begin()
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
index c33a0ee82..8199e5fa9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php
@@ -1,11 +1,20 @@
 <?php
 
-class AdminGenBrowser extends sfTestBrowser
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class AdminGenBrowser extends \sfTestBrowser
 {
-    protected $_modules = array('Article' => 'articles',
+    protected $_modules = ['Article' => 'articles',
         'Author' => 'authors',
         'Subscription' => 'subscriptions',
-        'User' => 'users');
+        'User' => 'users'];
 
     public function __construct()
     {
@@ -40,7 +49,7 @@ protected function _testValidSort()
 
         $matches = 0;
         foreach ($this->_getQueryExecutionEvents() as $event) {
-            if (false !== strpos($event->getQuery(), 'ORDER BY u.username asc')) {
+            if (str_contains($event->getQuery(), 'ORDER BY u.username asc')) {
                 ++$matches;
             }
         }
@@ -64,12 +73,12 @@ protected function _testValidSortType()
     {
         $this->info('Test valid sort_type parameter');
 
-        foreach (array('asc', 'desc', 'ASC', 'DESC') as $sortType) {
+        foreach (['asc', 'desc', 'ASC', 'DESC'] as $sortType) {
             $this->get('/users?sort=username&sort_type='.$sortType);
 
             $matches = 0;
             foreach ($this->_getQueryExecutionEvents() as $event) {
-                if (false !== strpos($event->getQuery(), 'ORDER BY u.username '.$sortType)) {
+                if (str_contains($event->getQuery(), 'ORDER BY u.username '.$sortType)) {
                     ++$matches;
                 }
             }
@@ -110,7 +119,7 @@ protected function _testArticleI18nEmbedded()
     {
         $this->info('Testing "articles" module embeds I18n');
 
-        $info = array('author_id' => 1, 'is_on_homepage' => false, 'en' => array('title' => 'Test English title', 'body' => 'Test English body'), 'fr' => array('title' => 'Test French title', 'body' => 'Test French body'), 'created_at' => array('month' => '1', 'day' => '12', 'year' => '2009', 'hour' => '10', 'minute' => '03'), 'updated_at' => array('month' => '1', 'day' => '12', 'year' => '2009', 'hour' => '10', 'minute' => '03'));
+        $info = ['author_id' => 1, 'is_on_homepage' => false, 'en' => ['title' => 'Test English title', 'body' => 'Test English body'], 'fr' => ['title' => 'Test French title', 'body' => 'Test French body'], 'created_at' => ['month' => '1', 'day' => '12', 'year' => '2009', 'hour' => '10', 'minute' => '03'], 'updated_at' => ['month' => '1', 'day' => '12', 'year' => '2009', 'hour' => '10', 'minute' => '03']];
 
         $this->
           get('/articles/new')->
@@ -127,15 +136,15 @@ protected function _testArticleI18nEmbedded()
               isParameter('module', 'articles')->
               isParameter('action', 'new')->
             end()->
-          click('Save', array('article' => $info))->
+          click('Save', ['article' => $info])->
             with('response')->begin()->
               isRedirected()->
               followRedirect()->
             end()->
             with('doctrine')->begin()->
-              check('Article', array('is_on_homepage' => $info['is_on_homepage']))->
-              check('ArticleTranslation', array('lang' => 'fr', 'title' => 'Test French title'))->
-              check('ArticleTranslation', array('lang' => 'en', 'title' => 'Test English title'))->
+              check('Article', ['is_on_homepage' => $info['is_on_homepage']])->
+              check('ArticleTranslation', ['lang' => 'fr', 'title' => 'Test French title'])->
+              check('ArticleTranslation', ['lang' => 'en', 'title' => 'Test English title'])->
             end();
     }
 
@@ -164,22 +173,22 @@ protected function _testUserEmbedsProfileForm()
 
         $this->info('Test the Profile form saves and attached to user properly');
 
-        $userInfo = array(
-            'user' => array(
+        $userInfo = [
+            'user' => [
                 'username' => 'test',
                 'password' => 'test',
-                'groups_list' => array(1, 2),
-                'permissions_list' => array(3, 4),
-                'Profile' => array(
+                'groups_list' => [1, 2],
+                'permissions_list' => [3, 4],
+                'Profile' => [
                     'first_name' => 'Test',
                     'last_name' => 'Test',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         $this->click('Save', $userInfo);
 
-        $user = Doctrine_Core::getTable('User')->findOneByUsername($userInfo['user']['username']);
+        $user = \Doctrine_Core::getTable('User')->findOneByUsername($userInfo['user']['username']);
         $userInfo['user']['Profile']['user_id'] = $user->id;
 
         $this->
@@ -188,12 +197,12 @@ protected function _testUserEmbedsProfileForm()
               followRedirect()->
             end()->
             with('doctrine')->begin()->
-              check('User', array('username' => $userInfo['user']['username']))->
+              check('User', ['username' => $userInfo['user']['username']])->
               check('Profile', $userInfo['user']['Profile'])->
-              check('UserGroup', array('user_id' => $user->id, 'group_id' => $user->Groups[0]->id))->
-              check('UserGroup', array('user_id' => $user->id, 'group_id' => $user->Groups[1]->id))->
-              check('UserPermission', array('user_id' => $user->id, 'permission_id' => $user->Permissions[0]->id))->
-              check('UserPermission', array('user_id' => $user->id, 'permission_id' => $user->Permissions[1]->id))->
+              check('UserGroup', ['user_id' => $user->id, 'group_id' => $user->Groups[0]->id])->
+              check('UserGroup', ['user_id' => $user->id, 'group_id' => $user->Groups[1]->id])->
+              check('UserPermission', ['user_id' => $user->id, 'permission_id' => $user->Permissions[0]->id])->
+              check('UserPermission', ['user_id' => $user->id, 'permission_id' => $user->Permissions[1]->id])->
             end();
 
         unset($userInfo['user']['Profile']['user_id']);
@@ -209,7 +218,7 @@ protected function _testUserEmbedsProfileForm()
     protected function _runAdminGenModuleSanityCheck($model, $module)
     {
         $this->info('Running admin gen sanity check for module "'.$module.'"');
-        $record = Doctrine_Core::getTable($model)
+        $record = \Doctrine_Core::getTable($model)
             ->createQuery('a')
             ->fetchOne()
         ;
@@ -231,8 +240,8 @@ protected function _runAdminGenModuleSanityCheck($model, $module)
     protected function _generateAdminGenModule($model, $module)
     {
         $this->info('Generating admin gen module "'.$module.'"');
-        $task = new sfDoctrineGenerateAdminTask($this->getContext()->getEventDispatcher(), new sfFormatter());
-        $task->run(array('application' => 'backend', 'route_or_model' => $model));
+        $task = new \sfDoctrineGenerateAdminTask($this->getContext()->getEventDispatcher(), new \sfFormatter());
+        $task->run(['application' => 'backend', 'route_or_model' => $model]);
     }
 
     protected function _generateAdminGenModules()
@@ -248,23 +257,23 @@ protected function _generateAdminGenModules()
 
     protected function _cleanupAdminGenModules()
     {
-        $fs = new sfFilesystem($this->getContext()->getEventDispatcher(), new sfFormatter());
+        $fs = new \sfFilesystem($this->getContext()->getEventDispatcher(), new \sfFormatter());
         foreach ($this->_modules as $module) {
             $this->info('Removing admin gen module "'.$module.'"');
-            $fs->execute('rm -rf '.sfConfig::get('sf_app_module_dir').'/'.$module);
+            $fs->execute('rm -rf '.\sfConfig::get('sf_app_module_dir').'/'.$module);
         }
-        $fs->execute('rm -rf '.sfConfig::get('sf_test_dir').'/functional/backend');
-        $fs->execute('rm -rf '.sfConfig::get('sf_data_dir').'/*.sqlite');
+        $fs->execute('rm -rf '.\sfConfig::get('sf_test_dir').'/functional/backend');
+        $fs->execute('rm -rf '.\sfConfig::get('sf_data_dir').'/*.sqlite');
     }
 
     protected function _getQueryExecutionEvents()
     {
-        $events = array();
+        $events = [];
 
         $databaseManager = $this->browser->getContext()->getDatabaseManager();
         foreach ($databaseManager->getNames() as $name) {
             $database = $databaseManager->getDatabase($name);
-            if ($database instanceof sfDoctrineDatabase && $profiler = $database->getProfiler()) {
+            if ($database instanceof \sfDoctrineDatabase && $profiler = $database->getProfiler()) {
                 foreach ($profiler->getQueryExecutionEvents() as $event) {
                     $events[$event->getSequence()] = $event;
                 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
index 6728f62e0..af9f761d9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/AdminGenTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,5 +16,5 @@
 
 require_once dirname(__FILE__).'/AdminGenBrowser.class.php';
 
-$b = new AdminGenBrowser();
+$b = new \AdminGenBrowser();
 $b->runTests();
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
index 804898925..9497ba8ec 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/EnvironmentSetupTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,10 +14,10 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(12);
+$t = new \lime_test(12);
 
 // Make sure Author records were populated properly
-$q = Doctrine_Query::create()
+$q = \Doctrine_Query::create()
     ->from('Author a')
 ;
 $results = $q->fetchArray();
@@ -26,7 +27,7 @@
 $t->is($results[1]['name'], 'Fabien POTENCIER');
 
 // Make sure data fixtures were loaded
-$q = Doctrine_Query::create()
+$q = \Doctrine_Query::create()
     ->from('Article a')
     ->leftJoin('a.Translation t')
 ;
@@ -34,26 +35,26 @@
 $articles = $q->fetchArray();
 $t->is($articles[0]['Translation']['en']['title'], 'English Title');
 
-$manager = Doctrine_Manager::getInstance();
+$manager = \Doctrine_Manager::getInstance();
 $conn1 = $manager->getConnection('doctrine1');
 $conn2 = $manager->getConnection('doctrine2');
 $conn3 = $manager->getConnection('doctrine3');
 
 // Make sure all connections are created properly from databases.yml
 $t->is(count($manager), 3);
-$t->is($conn1->getOption('dsn'), 'sqlite:'.str_replace(DIRECTORY_SEPARATOR, '/', sfConfig::get('sf_data_dir')).'/database1.sqlite');
-$t->is($conn2->getOption('dsn'), 'sqlite:'.str_replace(DIRECTORY_SEPARATOR, '/', sfConfig::get('sf_data_dir')).'/database2.sqlite');
-$t->is($conn3->getOption('dsn'), 'sqlite:'.str_replace(DIRECTORY_SEPARATOR, '/', sfConfig::get('sf_data_dir')).'/database3.sqlite');
+$t->is($conn1->getOption('dsn'), 'sqlite:'.str_replace(DIRECTORY_SEPARATOR, '/', \sfConfig::get('sf_data_dir')).'/database1.sqlite');
+$t->is($conn2->getOption('dsn'), 'sqlite:'.str_replace(DIRECTORY_SEPARATOR, '/', \sfConfig::get('sf_data_dir')).'/database2.sqlite');
+$t->is($conn3->getOption('dsn'), 'sqlite:'.str_replace(DIRECTORY_SEPARATOR, '/', \sfConfig::get('sf_data_dir')).'/database3.sqlite');
 
 // Set globally by ProjectConfiguration::configureDoctrine()
-$t->is($manager->getAttribute(Doctrine_Core::ATTR_VALIDATE), true);
+$t->is($manager->getAttribute(\Doctrine_Core::ATTR_VALIDATE), true);
 
 // We disable validation for the doctrine2 connection in ProjectConfiguration::configureDoctrineConnectionDoctrine2()
-$t->is($conn2->getAttribute(Doctrine_Core::ATTR_VALIDATE), false);
+$t->is($conn2->getAttribute(\Doctrine_Core::ATTR_VALIDATE), false);
 
 // We set export attribute on the connection in databases.yml
-$t->is($conn3->getAttribute(Doctrine_Core::ATTR_EXPORT), Doctrine_Core::EXPORT_TABLES);
+$t->is($conn3->getAttribute(\Doctrine_Core::ATTR_EXPORT), \Doctrine_Core::EXPORT_TABLES);
 
-$article = new ReflectionClass('Article');
-$parent = new ReflectionClass('myDoctrineRecord');
+$article = new \ReflectionClass('Article');
+$parent = new \ReflectionClass('myDoctrineRecord');
 $t->is($article->isSubclassOf($parent), true);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php
index a58b7a128..d2b20de58 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/FormGeneratorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,82 +14,82 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(41);
+$t = new \lime_test(41);
 
 $t->diag("Test that these models don't generate forms or filters classes");
-$noFormsOrFilters = array('UserGroup', 'UserPermission', 'GroupPermission');
+$noFormsOrFilters = ['UserGroup', 'UserPermission', 'GroupPermission'];
 foreach ($noFormsOrFilters as $model) {
-    $t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/'.$model.'Form.class.php'), false);
-    $t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/base/Base'.$model.'Form.class.php'), false);
-    $t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/'.$model.'FormFilter.class.php'), false);
-    $t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/base/Base'.$model.'FormFilter.class.php'), false);
+    $t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/'.$model.'Form.class.php'), false);
+    $t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/base/Base'.$model.'Form.class.php'), false);
+    $t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/'.$model.'FormFilter.class.php'), false);
+    $t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/base/Base'.$model.'FormFilter.class.php'), false);
 }
 
 $t->diag('FormGeneratorTest model should generate forms but not filters');
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTestForm.class.php'), true);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTestForm.class.php'), true);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTestForm.class.php'), true);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTestForm.class.php'), true);
 
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTestFormFilter.class.php'), false);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTestFormFilter.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTestFormFilter.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTestFormFilter.class.php'), false);
 
 $t->diag('FormGeneratorTest2 model should generate filters but not forms');
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTest2Form.class.php'), false);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTest2Form.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTest2Form.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTest2Form.class.php'), false);
 
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTest2FormFilter.class.php'), true);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTest2FormFilter.class.php'), true);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTest2FormFilter.class.php'), true);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTest2FormFilter.class.php'), true);
 
 $t->diag('FormGeneratorTest3 model should not generate forms or filters');
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTest3Form.class.php'), false);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTest3Form.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTest3Form.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTest3Form.class.php'), false);
 
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTest3FormFilter.class.php'), false);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTest3FormFilter.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTest3FormFilter.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTest3FormFilter.class.php'), false);
 
 $t->diag('FormGeneratorTest3Translation not generate forms or filters');
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTest3TranslationForm.class.php'), false);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTest3TranslationForm.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/FormGeneratorTest3TranslationForm.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/form/doctrine/base/BaseFormGeneratorTest3TranslationForm.class.php'), false);
 
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTest3TranslationFormFilter.class.php'), false);
-$t->is(file_exists(sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTest3TranslationFormFilter.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/FormGeneratorTest3TranslationFormFilter.class.php'), false);
+$t->is(file_exists(\sfConfig::get('sf_lib_dir').'/filter/doctrine/base/BaseFormGeneratorTest3TranslationFormFilter.class.php'), false);
 
 $t->diag('Check form generator generates forms with correct inheritance');
-$test = new AuthorInheritanceForm();
+$test = new \AuthorInheritanceForm();
 $t->is(is_subclass_of($test, 'AuthorForm'), true);
 
-$test = new AuthorInheritanceFormFilter();
+$test = new \AuthorInheritanceFormFilter();
 $t->is(is_subclass_of($test, 'AuthorFormFilter'), true);
 
 $t->diag('Check form generator adds columns to concrete inheritance forms');
-$test = new AuthorForm();
+$test = new \AuthorForm();
 $t->ok(!isset($test['additional']));
 
-$test = new AuthorInheritanceConcreteForm();
+$test = new \AuthorInheritanceConcreteForm();
 $t->ok(isset($test['additional']));
 
-$test = new AuthorFormFilter();
+$test = new \AuthorFormFilter();
 $t->ok(!isset($test['additional']));
 $t->ok(!array_key_exists('additional', $test->getFields()));
 
-$test = new AuthorInheritanceConcreteFormFilter();
+$test = new \AuthorInheritanceConcreteFormFilter();
 $t->ok(isset($test['additional']));
 $t->ok(array_key_exists('additional', $test->getFields()));
 
 $t->diag('Check form generator respects relations tweaked by inheritance');
-$test = new BlogArticleForm();
+$test = new \BlogArticleForm();
 $t->is($test->getWidget('author_id')->getOption('model'), 'BlogAuthor');
 $t->is($test->getValidator('author_id')->getOption('model'), 'BlogAuthor');
 
-$test = new BlogArticleFormFilter();
+$test = new \BlogArticleFormFilter();
 $t->is($test->getWidget('author_id')->getOption('model'), 'BlogAuthor');
 $t->is($test->getValidator('author_id')->getOption('model'), 'BlogAuthor');
 
 $t->diag('Check enum primary keys');
 
 try {
-    $test = new ResourceTypeForm();
+    $test = new \ResourceTypeForm();
     $t->pass('enum primary key widgets work');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->fail('enum primary key widgets work');
     $t->diag('    '.$e->getMessage());
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php
index dbd5ef652..3e96f81a4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/FormTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,24 +13,24 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(17);
+$t = new \lime_test(17);
 
 // test for ticket #4935
-$user = new User();
+$user = new \User();
 $profile = $user->getProfile();
 
-$userForm = new UserForm($user);
-$profileForm = new ProfileForm($profile);
+$userForm = new \UserForm($user);
+$profileForm = new \ProfileForm($profile);
 unset($profileForm['id'], $profileForm['user_id']);
 
 $userForm->embedForm('Profile', $profileForm);
 
-$data = array('username' => 'jwage',
+$data = ['username' => 'jwage',
     'password' => 'changeme',
-    'Profile' => array(
+    'Profile' => [
         'first_name' => 'Jonathan',
         'last_name' => 'Wage',
-    ));
+    ]];
 
 $userForm->bind($data);
 $userForm->save();
@@ -39,71 +40,71 @@
 $t->is($user->getUsername(), 'jwage');
 $t->is($profile->getFirstName(), 'Jonathan');
 
-$userCount = Doctrine_Query::create()
+$userCount = \Doctrine_Query::create()
     ->from('User u')
     ->count()
 ;
 
 $t->is($userCount, 1);
 
-$profileCount = Doctrine_Query::create()
+$profileCount = \Doctrine_Query::create()
     ->from('Profile p')
     ->count()
 ;
 
 $t->is($profileCount, 1);
 
-$widget = new sfWidgetFormDoctrineChoice(array('model' => 'User'));
-$t->is($widget->getChoices(), array(1 => 1));
+$widget = new \sfWidgetFormDoctrineChoice(['model' => 'User']);
+$t->is($widget->getChoices(), [1 => 1]);
 
-$widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'key_method' => 'getUsername', 'method' => 'getPassword'));
-$t->is($widget->getChoices(), array('jwage' => '4cb9c8a8048fd02294477fcb1a41191a'));
+$widget = new \sfWidgetFormDoctrineChoice(['model' => 'User', 'key_method' => 'getUsername', 'method' => 'getPassword']);
+$t->is($widget->getChoices(), ['jwage' => '4cb9c8a8048fd02294477fcb1a41191a']);
 
-$widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'key_method' => 'getUsername', 'method' => 'getPassword'));
-$t->is($widget->getChoices(), array('jwage' => '4cb9c8a8048fd02294477fcb1a41191a'));
+$widget = new \sfWidgetFormDoctrineChoice(['model' => 'User', 'key_method' => 'getUsername', 'method' => 'getPassword']);
+$t->is($widget->getChoices(), ['jwage' => '4cb9c8a8048fd02294477fcb1a41191a']);
 
-$methods = array(
+$methods = [
     'widgetChoiceTableMethod1',
     'widgetChoiceTableMethod2',
     'widgetChoiceTableMethod3',
-);
+];
 
 foreach ($methods as $method) {
-    $widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'table_method' => $method));
-    $t->is($widget->getChoices(), array(1 => 1));
+    $widget = new \sfWidgetFormDoctrineChoice(['model' => 'User', 'table_method' => $method]);
+    $t->is($widget->getChoices(), [1 => 1]);
 }
 
-$widget = new sfWidgetFormDoctrineChoice(array('model' => 'User', 'table_method' => 'widgetChoiceTableMethod4'));
-$t->is($widget->getChoices(), array());
+$widget = new \sfWidgetFormDoctrineChoice(['model' => 'User', 'table_method' => 'widgetChoiceTableMethod4']);
+$t->is($widget->getChoices(), []);
 
-$user = new User();
+$user = new \User();
 $user->Groups[]->name = 'User Group 1';
 $user->Groups[]->name = 'User Group 2';
 
-class UserGroupForm extends GroupForm
+class UserGroupForm extends \GroupForm
 {
     public function configure()
     {
         parent::configure();
-        $this->useFields(array('name'));
+        $this->useFields(['name']);
     }
 }
 
-$userForm = new UserForm($user);
+$userForm = new \UserForm($user);
 $userForm->embedRelation('Groups', 'UserGroupForm');
 
-$data = array(
+$data = [
     'username' => 'jonwage',
     'password' => 'changeme',
-    'Groups' => array(
-        0 => array(
+    'Groups' => [
+        0 => [
             'name' => 'New User Group 1 Name',
-        ),
-        1 => array(
+        ],
+        1 => [
             'name' => 'New User Group 2 Name',
-        ),
-    ),
-);
+        ],
+    ],
+];
 
 $userForm->bind($data);
 $t->is($userForm->isValid(), true);
@@ -115,6 +116,6 @@ public function configure()
 $t->is($user->Groups[0]->name, 'New User Group 1 Name');
 $t->is($user->Groups[1]->name, 'New User Group 2 Name');
 
-$form = new DefaultValueTestForm();
+$form = new \DefaultValueTestForm();
 $validatorSchema = $form->getValidatorSchema();
 $t->is($validatorSchema['name']->getOption('required'), false);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php
index a26a3c370..60d4e49c9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/I18nTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,13 +13,13 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(13);
+$t = new \lime_test(13);
 
-$article = new Article();
+$article = new \Article();
 $article->title = 'test';
 $t->is($article->Translation['en']->title, 'test');
 
-sfContext::getInstance()->getUser()->setCulture('fr');
+\sfContext::getInstance()->getUser()->setCulture('fr');
 $article->title = 'fr test';
 $t->is($article->Translation['fr']->title, 'fr test');
 
@@ -32,15 +33,15 @@
 
 $article->free(true);
 
-class MyArticleForm extends ArticleForm
+class MyArticleForm extends \ArticleForm
 {
     public function configure()
     {
         parent::configure();
 
-        $this->embedI18n(array('en', 'fr'));
+        $this->embedI18n(['en', 'fr']);
 
-        $authorForm = new AuthorForm($this->object->Author);
+        $authorForm = new \AuthorForm($this->object->Author);
         unset($authorForm['id']);
 
         $this->embedForm('Author', $authorForm);
@@ -49,59 +50,59 @@ public function configure()
     }
 }
 
-$article = new Article();
-$articleForm = new MyArticleForm($article);
+$article = new \Article();
+$articleForm = new \MyArticleForm($article);
 
-$data = array(
+$data = [
     'is_on_homepage' => 1,
-    'Author' => array(
+    'Author' => [
         'name' => 'i18n author test',
-        'type' => null),
-    'en' => array(
+        'type' => null],
+    'en' => [
         'title' => 'english title',
-        'body' => 'english body'),
-    'fr' => array(
+        'body' => 'english body'],
+    'fr' => [
         'title' => 'french title',
-        'body' => 'french body'),
+        'body' => 'french body'],
     'created_at' => time(),
     'updated_at' => time(),
-);
+];
 
 $articleForm->bind($data);
 $t->is($articleForm->isValid(), true);
 
 $data = $articleForm->getValues();
 
-$values = array(
+$values = [
     'is_on_homepage' => true,
-    'Author' => array(
+    'Author' => [
         'name' => 'i18n author test',
         'type' => null,
-    ),
-    'en' => array(
+    ],
+    'en' => [
         'title' => 'english title',
         'body' => 'english body',
         'test_column' => '',
         'slug' => '',
-    ),
-    'fr' => array(
+    ],
+    'fr' => [
         'title' => 'french title',
         'body' => 'french body',
         'test_column' => '',
         'slug' => '',
-    ),
+    ],
     'id' => null,
     'type' => null,
     'views' => null,
     'created_at' => $data['created_at'],
     'updated_at' => $data['updated_at'],
-);
+];
 
 $t->is($articleForm->getValues(), $values);
 
 $articleForm->save();
 
-$expected = array(
+$expected = [
     'id' => $article->id,
     'author_id' => $article->Author->id,
     'is_on_homepage' => true,
@@ -109,36 +110,36 @@ public function configure()
     'views' => null,
     'created_at' => $article->created_at,
     'updated_at' => $article->updated_at,
-    'Translation' => array(
-        'en' => array(
+    'Translation' => [
+        'en' => [
             'id' => $article->id,
             'title' => 'english title',
             'body' => 'english body',
             'test_column' => '',
             'lang' => 'en',
             'slug' => 'english-title',
-        ),
-        'fr' => array(
+        ],
+        'fr' => [
             'id' => $article->id,
             'title' => 'french title',
             'body' => 'french body',
             'test_column' => '',
             'lang' => 'fr',
             'slug' => 'french-title',
-        ),
-    ),
-    'Author' => array(
+        ],
+    ],
+    'Author' => [
         'id' => $article->Author->id,
         'name' => 'i18n author test',
         'type' => null,
-    ),
-);
+    ],
+];
 
 $t->is($article->toArray(true), $expected);
 
-$articleForm = new MyArticleForm($article);
+$articleForm = new \MyArticleForm($article);
 
-$expected = array(
+$expected = [
     'id' => $article->id,
     'author_id' => $article->author_id,
     'is_on_homepage' => true,
@@ -146,87 +147,87 @@ public function configure()
     'views' => null,
     'created_at' => $article->created_at,
     'updated_at' => $article->updated_at,
-    'en' => array(
+    'en' => [
         'id' => $article->id,
         'title' => 'english title',
         'body' => 'english body',
         'test_column' => '',
         'lang' => 'en',
         'slug' => 'english-title',
-    ),
-    'fr' => array(
+    ],
+    'fr' => [
         'id' => $article->id,
         'title' => 'french title',
         'body' => 'french body',
         'test_column' => '',
         'lang' => 'fr',
         'slug' => 'french-title',
-    ),
-    'Author' => array(
+    ],
+    'Author' => [
         'id' => $article->Author->id,
         'name' => 'i18n author test',
         'type' => null,
-    ),
-);
+    ],
+];
 
 $t->is($articleForm->getDefaults(), $expected);
 
 // Bug #7486
-$data = array(
+$data = [
     'id' => $article->id,
     'is_on_homepage' => true,
     'type' => null,
     'created_at' => $article->created_at,
     'updated_at' => $article->updated_at,
-    'en' => array(
+    'en' => [
         'id' => $article->id,
         'title' => 'english title',
         'body' => 'english body',
         'test_column' => '',
         'lang' => 'en',
         'slug' => 'english-title',
-    ),
-    'fr' => array(
+    ],
+    'fr' => [
         'id' => $article->id,
         'title' => 'french title',
         'body' => 'french body',
         'test_column' => '',
         'lang' => 'fr',
         'slug' => 'french-title',
-    ),
-    'Author' => array(
+    ],
+    'Author' => [
         'name' => 'i18n author test',
         'type' => null,
-    ),
-);
+    ],
+];
 
 $articleForm->bind($data);
 $t->is($articleForm->isValid(), true);
 
-$article = new Article();
-$articleForm = new MyArticleForm($article);
+$article = new \Article();
+$articleForm = new \MyArticleForm($article);
 
-$data = array(
+$data = [
     'is_on_homepage' => 1,
-    'Author' => array(
+    'Author' => [
         'name' => 'i18n author test',
-        'type' => null),
-    'en' => array(
+        'type' => null],
+    'en' => [
         'title' => 'english title',
-        'body' => 'english body'),
-    'fr' => array(
+        'body' => 'english body'],
+    'fr' => [
         'title' => 'french title',
-        'body' => 'french body'),
+        'body' => 'french body'],
     'created_at' => time(),
     'updated_at' => time(),
-);
+];
 
 $articleForm->bind($data);
 $t->is($articleForm->isValid(), false);
 // END: Bug #7486
 
-$article = new Article();
-sfContext::getInstance()->getUser()->setCulture('en');
+$article = new \Article();
+\sfContext::getInstance()->getUser()->setCulture('en');
 $article->title = 'test';
-sfContext::getInstance()->getUser()->setCulture('fr');
+\sfContext::getInstance()->getUser()->setCulture('fr');
 $t->is($article->title, 'test');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
index 840dcf127..6e1097ceb 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/PagerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,17 +13,17 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(23);
+$t = new \lime_test(23);
 
 $total = 50;
 for ($i = 0; $i < $total; ++$i) {
-    $author = new Author();
+    $author = new \Author();
     $author->name = 'Author #'.$i;
     $author->save();
 }
 
 $numPerPage = 25;
-$pager = new sfDoctrinePager('Author', $numPerPage);
+$pager = new \sfDoctrinePager('Author', $numPerPage);
 $pager->setTableMethod('testTableMethod');
 $pager->setPage(1);
 $pager->init();
@@ -44,26 +45,26 @@
 $t->is(count($results), $numPerPage);
 $t->is($pager->getCountQuery()->count(), $total);
 
-$pager = new sfDoctrinePager('Author', $numPerPage);
+$pager = new \sfDoctrinePager('Author', $numPerPage);
 $pager->setTableMethod('testTableMethod');
 $pager->setPage(1);
 $pager->init();
 
-$results = $pager->getResults(Doctrine_Core::HYDRATE_ARRAY);
+$results = $pager->getResults(\Doctrine_Core::HYDRATE_ARRAY);
 
 $t->is(gettype($results), 'array');
 $t->is(count($results), $numPerPage);
 
-$pager = new sfDoctrinePager('Author', $numPerPage);
+$pager = new \sfDoctrinePager('Author', $numPerPage);
 $pager->setTableMethod('testTableMethod2');
-$pager->setQuery(Doctrine_Query::create()->from('Author a')->where('a.id < 9999999'));
+$pager->setQuery(\Doctrine_Query::create()->from('Author a')->where('a.id < 9999999'));
 $pager->setPage(1);
 $pager->init();
 
 $t->is($pager->getQuery()->getSqlQuery(), 'SELECT a.id AS a__id, a.name AS a__name, a.type AS a__type FROM author a WHERE (a.id < 9999999 AND a.id > 0) LIMIT 25');
 
-$pager = new sfDoctrinePager('Author', $numPerPage);
-$pager->setQuery(Doctrine_Query::create()->from('Author a')->where('a.id < 9999999'));
+$pager = new \sfDoctrinePager('Author', $numPerPage);
+$pager->setQuery(\Doctrine_Query::create()->from('Author a')->where('a.id < 9999999'));
 $pager->setPage(1);
 $pager->init();
 
@@ -72,7 +73,7 @@
 // pager interface
 $t->diag('iterator interface');
 
-$pager = new sfDoctrinePager('Author', 10);
+$pager = new \sfDoctrinePager('Author', 10);
 $pager->init();
 foreach ($pager as $author) {
     $t->isa_ok($author, 'Author');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
index b4bf2d60f..0ccd17d79 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/RouteTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$tests = array(
+$tests = [
     '/doctrine/route/test1' => '/Article/',
     '/doctrine/route/test2' => '/Article/',
     '/doctrine/route/test3' => '/Doctrine_Collection/',
@@ -23,9 +24,9 @@
     '/doctrine/route/test7/some_fake_value' => '/Doctrine_Collection/',
     '/doctrine/route/test9/1/english-title/English+Title/test' => '/Article/',
     '/doctrine/route/test10/1/test' => '/Doctrine_Collection/',
-);
+];
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 foreach ($tests as $url => $check) {
     $b->
       get($url)->
@@ -35,31 +36,31 @@
       end();
 }
 
-$article = Doctrine_Core::getTable('Article')->find(1);
+$article = \Doctrine_Core::getTable('Article')->find(1);
 
-$routes = array(
-    'doctrine_route_test5' => array(
+$routes = [
+    'doctrine_route_test5' => [
         'url' => '/index.php/doctrine/route/test5/1/test-english-title',
         'params' => $article,
-    ),
-    'doctrine_route_test6' => array(
+    ],
+    'doctrine_route_test6' => [
         'url' => '/index.php/doctrine/route/test6/english-title/test-english-title',
         'params' => $article,
-    ),
-    'doctrine_route_test7' => array(
+    ],
+    'doctrine_route_test7' => [
         'url' => '/index.php/doctrine/route/test7/w00t',
-        'params' => array('testing_non_column' => 'w00t'),
-    ),
-    'doctrine_route_test8' => array(
+        'params' => ['testing_non_column' => 'w00t'],
+    ],
+    'doctrine_route_test8' => [
         'url' => '/index.php/doctrine/route/test8/1/english-title/English+Title/test',
-        'params' => array(
+        'params' => [
             'id' => $article->id,
             'slug' => $article->slug,
             'title' => $article->title,
             'testing_non_column2' => 'test',
-        ),
-    ),
-);
+        ],
+    ],
+];
 
 foreach ($routes as $route => $check) {
     $url = url_for2($route, $check['params']);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
index d6ed371f1..e6f7b906c 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/SchemaMergeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,24 +13,24 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
-$table = Doctrine_Core::getTable('Setting');
+$table = \Doctrine_Core::getTable('Setting');
 
 // columns
 $t->diag('columns');
 
-$t->is_deeply($table->getColumnDefinition('name'), array(
+$t->is_deeply($table->getColumnDefinition('name'), [
     'type' => 'string',
     'length' => 255,
     'notnull' => true,
-), 'the short "type" syntax is expanded');
+], 'the short "type" syntax is expanded');
 
-$t->is_deeply($table->getColumnDefinition('weight'), array(
+$t->is_deeply($table->getColumnDefinition('weight'), [
     'type' => 'float',
     'length' => 4,
     'scale' => 4,
-), 'the short "type(length, scale)" syntax is expanded');
+], 'the short "type(length, scale)" syntax is expanded');
 
 // actAs
 $t->diag('actAs');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
index f0837e4d5..3cc0f2248 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/5269Test.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +13,9 @@
 
 require_once dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-class TestUserForm extends UserForm
+class TestUserForm extends \UserForm
 {
     public function configure()
     {
@@ -23,7 +24,7 @@ public function configure()
     }
 }
 
-$user = new User();
+$user = new \User();
 $user->username = 'nullvaluetest';
 $user->password = 'changeme';
 $user->test = 'test';
@@ -31,9 +32,9 @@ public function configure()
 $user->free();
 unset($user);
 
-$user = Doctrine_Core::getTable('User')->findOneByUsername('nullvaluetest');
-$userForm = new TestUserForm($user);
-$userForm->bind(array('id' => $user->id, 'username' => 'nullvaluetest', 'password' => 'changeme2'));
+$user = \Doctrine_Core::getTable('User')->findOneByUsername('nullvaluetest');
+$userForm = new \TestUserForm($user);
+$userForm->bind(['id' => $user->id, 'username' => 'nullvaluetest', 'password' => 'changeme2']);
 if ($userForm->isValid()) {
     $userForm->save();
 }
@@ -41,5 +42,5 @@ public function configure()
 $user->free();
 unset($user);
 
-$user = Doctrine_Core::getTable('User')->findOneByUsername('nullvaluetest');
-$t->is($user->toArray(), array('id' => 1, 'username' => 'nullvaluetest', 'password' => 'b0660f0b8b989971524762330aea5449', 'test' => 'test'));
+$user = \Doctrine_Core::getTable('User')->findOneByUsername('nullvaluetest');
+$t->is($user->toArray(), ['id' => 1, 'username' => 'nullvaluetest', 'password' => 'b0660f0b8b989971524762330aea5449', 'test' => 'test']);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php
index e7d594adc..c5db43cec 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/Ticket/7774Test.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,10 +12,10 @@
 $app = 'frontend';
 
 require_once dirname(__FILE__).'/../../bootstrap/functional.php';
-if (!is_link(sfConfig::get('sf_config_dir').'/doctrine/linked_schema.yml')) {
+if (!is_link(\sfConfig::get('sf_config_dir').'/doctrine/linked_schema.yml')) {
     return;
 }
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 $t->is(class_exists('ModelFromLinkedSchema'), true, 'models from symlinked schema files are built');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
index 28fb2de1f..e9e0e02b0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/UniqueTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,20 +13,20 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$data = array(
+$data = [
     'unique_test1' => 'test',
     'unique_test2' => 'test',
     'unique_test3' => 'test',
     'unique_test4' => 'test',
-);
+];
 
-$uniqueTestForm = new UniqueTestForm();
+$uniqueTestForm = new \UniqueTestForm();
 $uniqueTestForm->bind($data);
 $uniqueTestForm->save();
 
-$uniqueTestForm = new UniqueTestForm();
+$uniqueTestForm = new \UniqueTestForm();
 $uniqueTestForm->bind($data);
 $t->is($uniqueTestForm->isValid(), false);
 $t->is((string) $uniqueTestForm->getErrorSchema(), 'unique_test1 [An object with the same "unique_test1" already exist. An object with the same "unique_test1, unique_test2" already exist.] unique_test4 [An object with the same "unique_test4" already exist.]');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
index a23c889eb..b1ec96818 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/UploadTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,23 +13,23 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$browser = new sfTestFunctional(new sfBrowser(), null, array(
+$browser = new \sfTestFunctional(new \sfBrowser(), null, [
     'doctrine' => 'sfTesterDoctrine',
-));
+]);
 
 $browser
     ->get('/attachment/index')
-    ->setField('attachment[file_path]', sfConfig::get('sf_config_dir').'/databases.yml')
+    ->setField('attachment[file_path]', \sfConfig::get('sf_config_dir').'/databases.yml')
     ->click('submit')
     ->with('response')->begin()
     ->checkElement('h1:contains("ok")')
     ->end()
-    ->with('doctrine')->check('Attachment', array(
-        'file_path' => AttachmentForm::TEST_GENERATED_FILENAME,
-    ), 1)
+    ->with('doctrine')->check('Attachment', [
+        'file_path' => \AttachmentForm::TEST_GENERATED_FILENAME,
+    ], 1)
 ;
 
-$browser->test()->is(file_exists(sfConfig::get('sf_cache_dir').'/'.AttachmentForm::TEST_GENERATED_FILENAME), true, 'uploaded file is named correctly');
+$browser->test()->is(file_exists(\sfConfig::get('sf_cache_dir').'/'.\AttachmentForm::TEST_GENERATED_FILENAME), true, 'uploaded file is named correctly');
 
 $browser
     ->get('/attachment/editable?id=1')
@@ -37,9 +38,9 @@
     ->with('response')->begin()
     ->checkElement('h1', 'ok')
     ->end()
-    ->with('doctrine')->check('Attachment', array(
-        'file_path' => AttachmentForm::TEST_GENERATED_FILENAME,
-    ), false)
+    ->with('doctrine')->check('Attachment', [
+        'file_path' => \AttachmentForm::TEST_GENERATED_FILENAME,
+    ], false)
 ;
 
-$browser->test()->is(file_exists(sfConfig::get('sf_cache_dir').'/'.AttachmentForm::TEST_GENERATED_FILENAME), false, 'uploaded file is removed');
+$browser->test()->is(file_exists(\sfConfig::get('sf_cache_dir').'/'.\AttachmentForm::TEST_GENERATED_FILENAME), false, 'uploaded file is removed');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php
index 36be3be8f..1e0c9985f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/config/backendConfiguration.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class backendConfiguration extends sfApplicationConfiguration
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class backendConfiguration extends \sfApplicationConfiguration
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php
index 4c793028e..12f4a6aaf 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/lib/myUser.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myUser extends \sfBasicSecurityUser
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
index 05d80dadd..4d9d42c87 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * doctrine_route_test actions.
  *
@@ -7,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class doctrine_route_testActions extends sfActions
+class doctrine_route_testActions extends \sfActions
 {
-    public function executeIndex(sfWebRequest $request)
+    public function executeIndex(\sfWebRequest $request)
     {
         try {
             $this->object = $this->getRoute()->getObjects();
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             try {
                 $this->object = $this->getRoute()->getObject();
-            } catch (Exception $e) {
-                return sfView::NONE;
+            } catch (\Exception $e) {
+                return \sfView::NONE;
             }
         }
     }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/templates/indexSuccess.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/templates/indexSuccess.php
index 2db6f320e..134f3f469 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/templates/indexSuccess.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/templates/indexSuccess.php
@@ -1,3 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 echo get_class($object);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
index 681074466..18d195a05 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once dirname(__FILE__).'/../lib/my_articlesGeneratorConfiguration.class.php';
 
 require_once dirname(__FILE__).'/../lib/my_articlesGeneratorHelper.class.php';
@@ -11,6 +20,6 @@
  *
  * @version    SVN: $Id$
  */
-class my_articlesActions extends autoMy_articlesActions
+class my_articlesActions extends \autoMy_articlesActions
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
index d91aad195..50fcceedb 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * my_articles module configuration.
  *
@@ -7,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class my_articlesGeneratorConfiguration extends BaseMy_articlesGeneratorConfiguration
+class my_articlesGeneratorConfiguration extends \BaseMy_articlesGeneratorConfiguration
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
index 5f9b7ccbe..14bd51611 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * my_articles module helper.
  *
@@ -7,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class my_articlesGeneratorHelper extends BaseMy_articlesGeneratorHelper
+class my_articlesGeneratorHelper extends \BaseMy_articlesGeneratorHelper
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
index 8e52a8c98..7c10d5bd0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class frontendConfiguration extends sfApplicationConfiguration
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class frontendConfiguration extends \sfApplicationConfiguration
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php
index 4c793028e..12f4a6aaf 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myUser extends \sfBasicSecurityUser
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
index aea3c9b78..c0bdae529 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * articles actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class articlesActions extends sfActions
+class articlesActions extends \sfActions
 {
     public function executeIndex()
     {
@@ -16,7 +25,7 @@ public function executeIndex()
 
     public function executeRedirectToShow()
     {
-        $this->redirect('article', Doctrine_Core::getTable('Article')->createQuery()->fetchOne());
+        $this->redirect('article', \Doctrine_Core::getTable('Article')->createQuery()->fetchOne());
     }
 
     public function executeShow()
@@ -26,7 +35,7 @@ public function executeShow()
 
     public function executeCreate()
     {
-        $this->form = new ArticleForm();
+        $this->form = new \ArticleForm();
 
         $this->setTemplate('edit');
     }
@@ -38,7 +47,7 @@ public function executeEdit($request)
 
     public function executeUpdate($request)
     {
-        $this->forward404Unless($request->isMethod(sfRequest::POST));
+        $this->forward404Unless($request->isMethod(\sfRequest::POST));
 
         $this->form = $this->getArticleForm($request->getParameter('id'));
 
@@ -63,7 +72,7 @@ public function executeDelete($request)
 
     private function getArticleTable()
     {
-        return Doctrine_Core::getTable('Article');
+        return \Doctrine_Core::getTable('Article');
     }
 
     private function getArticleById($id)
@@ -75,10 +84,10 @@ private function getArticleForm($id)
     {
         $article = $this->getArticleById($id);
 
-        if ($article instanceof Article) {
-            return new ArticleForm($article);
+        if ($article instanceof \Article) {
+            return new \ArticleForm($article);
         }
 
-        return new ArticleForm();
+        return new \ArticleForm();
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/editSuccess.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/editSuccess.php
index 167f2c784..f2a94c235 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/editSuccess.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/templates/editSuccess.php
@@ -8,7 +8,7 @@
         <td colspan="2">
           &nbsp;<a href="<?php echo url_for('articles/index'); ?>">Back to list</a>
           <?php if (!$form->isNew()) { ?>
-            &nbsp;<?php echo link_to('Delete', 'articles/delete?id='.$article->get('id'), array('post' => true, 'confirm' => 'Are you sure?')); ?>
+            &nbsp;<?php echo link_to('Delete', 'articles/delete?id='.$article->get('id'), ['post' => true, 'confirm' => 'Are you sure?']); ?>
           <?php } ?>
           <input type="submit" value="Save" />
         </td>
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
index c2275a960..f7acbe579 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * attachment actions.
  *
@@ -7,16 +16,16 @@
  *
  * @version    SVN: $Id$
  */
-class attachmentActions extends sfActions
+class attachmentActions extends \sfActions
 {
     /**
      * Executes index action.
      *
-     * @param sfRequest $request A request object
+     * @param \sfRequest $request A request object
      */
-    public function executeIndex(sfWebRequest $request)
+    public function executeIndex(\sfWebRequest $request)
     {
-        $this->form = new AttachmentForm();
+        $this->form = new \AttachmentForm();
         unset($this->form['id']);
 
         if (
@@ -26,18 +35,18 @@ public function executeIndex(sfWebRequest $request)
                 $request->getFiles($this->form->getName())
             )
         ) {
-            return sfView::SUCCESS;
+            return \sfView::SUCCESS;
         }
 
-        return sfView::INPUT;
+        return \sfView::INPUT;
     }
 
-    public function executeEditable(sfWebRequest $request)
+    public function executeEditable(\sfWebRequest $request)
     {
-        $attachment = Doctrine_Core::getTable('Attachment')->find($request['id']);
+        $attachment = \Doctrine_Core::getTable('Attachment')->find($request['id']);
         $this->forward404Unless($attachment, 'Attachment not found');
 
-        $this->form = new AttachmentForm($attachment);
+        $this->form = new \AttachmentForm($attachment);
         if (
             $request->isMethod('post')
             && $this->form->bindAndSave(
@@ -45,9 +54,9 @@ public function executeEditable(sfWebRequest $request)
                 $request->getFiles($this->form->getName())
             )
         ) {
-            return sfView::SUCCESS;
+            return \sfView::SUCCESS;
         }
 
-        return sfView::INPUT;
+        return \sfView::INPUT;
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
index 659c14f4b..cca50d9f5 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
@@ -1,65 +1,74 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once dirname(__FILE__).'/../../../../../../autoload/sfCoreAutoload.class.php';
-sfCoreAutoload::register();
+\sfCoreAutoload::register();
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
     public function setup()
     {
         $this->enableAllPluginsExcept();
 
-        $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrine'));
-        $this->dispatcher->connect('doctrine.configure_connection', array($this, 'configureDoctrineConnection'));
-        $this->dispatcher->connect('doctrine.filter_model_builder_options', array($this, 'configureDoctrineModelBuilder'));
+        $this->dispatcher->connect('doctrine.configure', [$this, 'configureDoctrine']);
+        $this->dispatcher->connect('doctrine.configure_connection', [$this, 'configureDoctrineConnection']);
+        $this->dispatcher->connect('doctrine.filter_model_builder_options', [$this, 'configureDoctrineModelBuilder']);
     }
 
     public function initializeDoctrine()
     {
-        chdir(sfConfig::get('sf_root_dir'));
+        chdir(\sfConfig::get('sf_root_dir'));
 
-        $task = new sfDoctrineBuildTask($this->dispatcher, new sfFormatter());
+        $task = new \sfDoctrineBuildTask($this->dispatcher, new \sfFormatter());
         $task->setConfiguration($this);
-        $task->run(array(), array(
+        $task->run([], [
             'no-confirmation' => true,
             'db' => true,
             'model' => true,
             'forms' => true,
             'filters' => true,
-        ));
+        ]);
     }
 
     public function loadFixtures($fixtures)
     {
-        $path = sfConfig::get('sf_data_dir').'/'.$fixtures;
+        $path = \sfConfig::get('sf_data_dir').'/'.$fixtures;
         if (!file_exists($path)) {
-            throw new sfException('Invalid data fixtures file');
+            throw new \sfException('Invalid data fixtures file');
         }
-        chdir(sfConfig::get('sf_root_dir'));
-        $task = new sfDoctrineDataLoadTask($this->dispatcher, new sfFormatter());
+        chdir(\sfConfig::get('sf_root_dir'));
+        $task = new \sfDoctrineDataLoadTask($this->dispatcher, new \sfFormatter());
         $task->setConfiguration($this);
-        $task->run(array($path));
+        $task->run([$path]);
     }
 
-    public function configureDoctrine(sfEvent $event)
+    public function configureDoctrine(\sfEvent $event)
     {
         $manager = $event->getSubject();
-        $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
+        $manager->setAttribute(\Doctrine_Core::ATTR_VALIDATE, true);
     }
 
-    public function configureDoctrineModelBuilder(sfEvent $event, $options)
+    public function configureDoctrineModelBuilder(\sfEvent $event, $options)
     {
         $options['baseClassName'] = 'myDoctrineRecord';
 
         return $options;
     }
 
-    public function configureDoctrineConnection(sfEvent $event)
+    public function configureDoctrineConnection(\sfEvent $event)
     {
         $parameters = $event->getParameters();
 
         if ('doctrine2' === $parameters['connection']->getName()) {
-            $parameters['connection']->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+            $parameters['connection']->setAttribute(\Doctrine_Core::ATTR_VALIDATE, false);
         }
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
index 3f970f4d8..e0ebcef2e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Article filter form.
  *
  * @version    SVN: $Id$
  */
-class ArticleFormFilter extends BaseArticleFormFilter
+class ArticleFormFilter extends \BaseArticleFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
index bfb0b277c..7d9c81536 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ArticleTranslation filter form.
  *
  * @version    SVN: $Id$
  */
-class ArticleTranslationFormFilter extends BaseArticleTranslationFormFilter
+class ArticleTranslationFormFilter extends \BaseArticleTranslationFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
index b6533b48f..cb170d263 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Attachment filter form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class AttachmentFormFilter extends BaseAttachmentFormFilter
+class AttachmentFormFilter extends \BaseAttachmentFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
index be441404f..f3db9306d 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Author filter form.
  *
  * @version    SVN: $Id$
  */
-class AuthorFormFilter extends BaseAuthorFormFilter
+class AuthorFormFilter extends \BaseAuthorFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
index 6ad8fb0f5..95edec8aa 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * AuthorInheritanceConcrete filter form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class AuthorInheritanceConcreteFormFilter extends BaseAuthorInheritanceConcreteFormFilter
+class AuthorInheritanceConcreteFormFilter extends \BaseAuthorInheritanceConcreteFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
index 5ed4843e0..2142f7d87 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * AuthorInheritance filter form.
  *
  * @version    SVN: $Id$
  */
-class AuthorInheritanceFormFilter extends BaseAuthorInheritanceFormFilter
+class AuthorInheritanceFormFilter extends \BaseAuthorInheritanceFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
index 0270ae95e..de8e15d04 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
@@ -1,11 +1,15 @@
 <?php
 
-/**
- * Project filter form base class.
+/*
+ * This file is part of the Symfony1 package.
  *
- * @version    SVN: $Id$
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-abstract class BaseFormFilterDoctrine extends sfFormFilterDoctrine
+
+abstract class BaseFormFilterDoctrine extends \sfFormFilterDoctrine
 {
     public function setup()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
index b78d4ef18..e85710f10 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogArticle filter form.
  *
@@ -7,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class BlogArticleFormFilter extends BaseBlogArticleFormFilter
+class BlogArticleFormFilter extends \BaseBlogArticleFormFilter
 {
     /**
-     * @see ArticleFormFilter
+     * @see \ArticleFormFilter
      */
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
index a630b7444..ed9075526 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogArticleTranslation filter form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class BlogArticleTranslationFormFilter extends BaseBlogArticleTranslationFormFilter
+class BlogArticleTranslationFormFilter extends \BaseBlogArticleTranslationFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
index c25144d39..8c2679ec4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogAuthor filter form.
  *
@@ -7,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class BlogAuthorFormFilter extends BaseBlogAuthorFormFilter
+class BlogAuthorFormFilter extends \BaseBlogAuthorFormFilter
 {
     /**
-     * @see AuthorFormFilter
+     * @see \AuthorFormFilter
      */
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
index 76bf7c1d5..78e9a9090 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * CamelCase filter form.
  *
  * @version    SVN: $Id$
  */
-class CamelCaseFormFilter extends BaseCamelCaseFormFilter
+class CamelCaseFormFilter extends \BaseCamelCaseFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
index 9e9613a2d..916ea193c 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * DefaultValueTest filter form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class DefaultValueTestFormFilter extends BaseDefaultValueTestFormFilter
+class DefaultValueTestFormFilter extends \BaseDefaultValueTestFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
index 052581610..efac2f180 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * FormGeneratorTest2 filter form.
  *
  * @version    SVN: $Id$
  */
-class FormGeneratorTest2FormFilter extends BaseFormGeneratorTest2FormFilter
+class FormGeneratorTest2FormFilter extends \BaseFormGeneratorTest2FormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
index 562102d2f..8e1cee330 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Group filter form.
  *
  * @version    SVN: $Id$
  */
-class GroupFormFilter extends BaseGroupFormFilter
+class GroupFormFilter extends \BaseGroupFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
index abb691ffc..7753a6cc4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Permission filter form.
  *
  * @version    SVN: $Id$
  */
-class PermissionFormFilter extends BasePermissionFormFilter
+class PermissionFormFilter extends \BasePermissionFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
index 2af657e14..9eab7858d 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Profile filter form.
  *
  * @version    SVN: $Id$
  */
-class ProfileFormFilter extends BaseProfileFormFilter
+class ProfileFormFilter extends \BaseProfileFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
index f3c530fd3..de339fc48 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ResourceType filter form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class ResourceTypeFormFilter extends BaseResourceTypeFormFilter
+class ResourceTypeFormFilter extends \BaseResourceTypeFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
index 68ca40683..5f6d71ad4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Setting filter form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class SettingFormFilter extends PluginSettingFormFilter
+class SettingFormFilter extends \PluginSettingFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
index 6f5f20cd5..4bd090245 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Subscription filter form.
  *
  * @version    SVN: $Id$
  */
-class SubscriptionFormFilter extends BaseSubscriptionFormFilter
+class SubscriptionFormFilter extends \BaseSubscriptionFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
index 60d896124..e4086b83c 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * UniqueTest filter form.
  *
  * @version    SVN: $Id$
  */
-class UniqueTestFormFilter extends BaseUniqueTestFormFilter
+class UniqueTestFormFilter extends \BaseUniqueTestFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
index d700bccf3..7edb75561 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * User filter form.
  *
  * @version    SVN: $Id$
  */
-class UserFormFilter extends BaseUserFormFilter
+class UserFormFilter extends \BaseUserFormFilter
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
index f7ffaad5e..143164658 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Base project form.
  *
@@ -7,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class BaseForm extends sfFormSymfony
+class BaseForm extends \sfFormSymfony
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
index 9def10c17..d3de6633e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
@@ -1,14 +1,23 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Article form.
  *
  * @version    SVN: $Id$
  */
-class ArticleForm extends BaseArticleForm
+class ArticleForm extends \BaseArticleForm
 {
     public function configure()
     {
-        $this->embedI18n(array('en', 'fr'));
+        $this->embedI18n(['en', 'fr']);
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
index eeb3eb6fe..ef1e6cef0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ArticleTranslation form.
  *
  * @version    SVN: $Id$
  */
-class ArticleTranslationForm extends BaseArticleTranslationForm
+class ArticleTranslationForm extends \BaseArticleTranslationForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
index 904de2898..02b2f0cd4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Attachment form.
  *
@@ -7,22 +16,22 @@
  *
  * @version    SVN: $Id$
  */
-class AttachmentForm extends BaseAttachmentForm
+class AttachmentForm extends \BaseAttachmentForm
 {
     public const TEST_GENERATED_FILENAME = 'test123';
 
     public function configure()
     {
-        $this->widgetSchema['file_path'] = new sfWidgetFormInputFileEditable(array(
-            'file_src' => sfConfig::get('sf_cache_dir').'/'.$this->getObject()->file_path,
+        $this->widgetSchema['file_path'] = new \sfWidgetFormInputFileEditable([
+            'file_src' => \sfConfig::get('sf_cache_dir').'/'.$this->getObject()->file_path,
             'edit_mode' => !$this->isNew(),
-        ));
-        $this->validatorSchema['file_path'] = new sfValidatorFile(array(
-            'path' => sfConfig::get('sf_cache_dir'),
-            'mime_type_guessers' => array(),
+        ]);
+        $this->validatorSchema['file_path'] = new \sfValidatorFile([
+            'path' => \sfConfig::get('sf_cache_dir'),
+            'mime_type_guessers' => [],
             'required' => false,
-        ));
-        $this->validatorSchema['file_path_delete'] = new sfValidatorBoolean();
+        ]);
+        $this->validatorSchema['file_path_delete'] = new \sfValidatorBoolean();
     }
 
     protected function generateFilePathFilename()
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
index 96fb68fa3..95af00ad6 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Author form.
  *
  * @version    SVN: $Id$
  */
-class AuthorForm extends BaseAuthorForm
+class AuthorForm extends \BaseAuthorForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
index 4f6a924a7..f090f7da9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * AuthorInheritanceConcrete form.
  *
@@ -7,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class AuthorInheritanceConcreteForm extends BaseAuthorInheritanceConcreteForm
+class AuthorInheritanceConcreteForm extends \BaseAuthorInheritanceConcreteForm
 {
     /**
-     * @see AuthorForm
+     * @see \AuthorForm
      */
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
index cc86e6f5c..2fb26290e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * AuthorInheritance form.
  *
  * @version    SVN: $Id$
  */
-class AuthorInheritanceForm extends BaseAuthorInheritanceForm
+class AuthorInheritanceForm extends \BaseAuthorInheritanceForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
index 1bf8aa2a2..97dcbfbe6 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
@@ -1,11 +1,15 @@
 <?php
 
-/**
- * Project form base class.
+/*
+ * This file is part of the Symfony1 package.
  *
- * @version    SVN: $Id$
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-abstract class BaseFormDoctrine extends sfFormDoctrine
+
+abstract class BaseFormDoctrine extends \sfFormDoctrine
 {
     public function setup()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
index 5d60b44e8..0ff514fb1 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogArticle form.
  *
@@ -7,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class BlogArticleForm extends BaseBlogArticleForm
+class BlogArticleForm extends \BaseBlogArticleForm
 {
     /**
-     * @see ArticleForm
+     * @see \ArticleForm
      */
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
index ca3cb470e..21d36d3f1 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogArticleTranslation form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class BlogArticleTranslationForm extends BaseBlogArticleTranslationForm
+class BlogArticleTranslationForm extends \BaseBlogArticleTranslationForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
index 04c807ebf..814823b34 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogAuthor form.
  *
@@ -7,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class BlogAuthorForm extends BaseBlogAuthorForm
+class BlogAuthorForm extends \BaseBlogAuthorForm
 {
     /**
-     * @see AuthorForm
+     * @see \AuthorForm
      */
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
index 9a3a7599d..8ae375e61 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * CamelCase form.
  *
  * @version    SVN: $Id$
  */
-class CamelCaseForm extends BaseCamelCaseForm
+class CamelCaseForm extends \BaseCamelCaseForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
index c74747dec..2354521ed 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * DefaultValueTest form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class DefaultValueTestForm extends BaseDefaultValueTestForm
+class DefaultValueTestForm extends \BaseDefaultValueTestForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
index 8f5f97c45..49f1fc96f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * FormGeneratorTest form.
  *
  * @version    SVN: $Id$
  */
-class FormGeneratorTestForm extends BaseFormGeneratorTestForm
+class FormGeneratorTestForm extends \BaseFormGeneratorTestForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
index 81ecd8427..6af8050fd 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Group form.
  *
  * @version    SVN: $Id$
  */
-class GroupForm extends BaseGroupForm
+class GroupForm extends \BaseGroupForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
index 86f4386ba..f5b016218 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Permission form.
  *
  * @version    SVN: $Id$
  */
-class PermissionForm extends BasePermissionForm
+class PermissionForm extends \BasePermissionForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
index 21a327ad3..bf979bead 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Profile form.
  *
  * @version    SVN: $Id$
  */
-class ProfileForm extends BaseProfileForm
+class ProfileForm extends \BaseProfileForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
index 44ec435f8..01245425e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ResourceType form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class ResourceTypeForm extends BaseResourceTypeForm
+class ResourceTypeForm extends \BaseResourceTypeForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
index 2d0211442..1085c1786 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Setting form.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class SettingForm extends PluginSettingForm
+class SettingForm extends \PluginSettingForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
index 2cae31f70..ccd04cf45 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Subscription form.
  *
  * @version    SVN: $Id$
  */
-class SubscriptionForm extends BaseSubscriptionForm
+class SubscriptionForm extends \BaseSubscriptionForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
index a9bea3b70..bc1b4cc0e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * UniqueTest form.
  *
  * @version    SVN: $Id$
  */
-class UniqueTestForm extends BaseUniqueTestForm
+class UniqueTestForm extends \BaseUniqueTestForm
 {
     public function configure()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
index fd43fc84c..e339f1822 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
@@ -1,15 +1,24 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * User form.
  *
  * @version    SVN: $Id$
  */
-class UserForm extends BaseUserForm
+class UserForm extends \BaseUserForm
 {
     public function configure()
     {
-        $profileForm = new ProfileForm($this->object->getProfile());
+        $profileForm = new \ProfileForm($this->object->getProfile());
         unset($profileForm['id'], $profileForm['user_id']);
 
         $this->embedForm('Profile', $profileForm);
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Article.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Article.class.php
index 84c8098c0..ea06ee018 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Article.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Article.class.php
@@ -1,9 +1,18 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class Article extends BaseArticle
+class Article extends \BaseArticle
 {
     public function getTestingNonColumn()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php
index 487cb17f3..4822a4bd9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php
@@ -1,10 +1,20 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class ArticleTable extends Doctrine_Table
+class ArticleTable extends \Doctrine_Table
 {
-    public function retrieveArticle1(Doctrine_Query $query)
+    public function retrieveArticle1(\Doctrine_Query $query)
     {
         return $query->execute();
     }
@@ -32,7 +42,7 @@ public function retrieveArticle4(array $parameters)
 
     public function routeTest9(array $parameters)
     {
-        return Doctrine_Query::create()
+        return \Doctrine_Query::create()
             ->from('Article a')
             ->where('a.id = ?', $parameters['id'])
             ->limit(1)
@@ -40,14 +50,14 @@ public function routeTest9(array $parameters)
         ;
     }
 
-    public function routeTest10(Doctrine_Query $q)
+    public function routeTest10(\Doctrine_Query $q)
     {
         $q->orWhere($q->getRootAlias().'.is_on_homepage = ?', 0);
 
         return $q->fetchOne();
     }
 
-    public function testAdminGenTableMethod(Doctrine_Query $q)
+    public function testAdminGenTableMethod(\Doctrine_Query $q)
     {
         return $q;
     }
@@ -57,7 +67,7 @@ public function getNewQuery()
         return $this->createQuery()->select('title, body');
     }
 
-    public function addOnHomepage(Doctrine_Query $q = null)
+    public function addOnHomepage(\Doctrine_Query $q = null)
     {
         if (is_null($q)) {
             $q = $this->createQuery('a');
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
index f85160b8d..864ab2f78 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Attachment.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class Attachment extends BaseAttachment
+class Attachment extends \BaseAttachment
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AttachmentTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AttachmentTable.class.php
index 339d1d5be..2d35c7fbc 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AttachmentTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AttachmentTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class AttachmentTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class AttachmentTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Author.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Author.class.php
index b7fc278a8..3d4cac3fa 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Author.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Author.class.php
@@ -1,14 +1,23 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class Author extends BaseAuthor
+class Author extends \BaseAuthor
 {
     public function setName($name)
     {
         if (!$this->exists()) {
-            $author = Doctrine_Core::getTable('Author')->findOneByName(trim($name));
+            $author = \Doctrine_Core::getTable('Author')->findOneByName(trim($name));
             if ($author) {
                 $this->assignIdentifier($author->identifier());
             } else {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
index cd54b43e6..340932a1a 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * AuthorInheritance.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class AuthorInheritance extends BaseAuthorInheritance
+class AuthorInheritance extends \BaseAuthorInheritance
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
index 69e5d46f4..80aba5d67 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * AuthorInheritanceConcrete.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class AuthorInheritanceConcrete extends BaseAuthorInheritanceConcrete
+class AuthorInheritanceConcrete extends \BaseAuthorInheritanceConcrete
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcreteTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcreteTable.class.php
index 24d7647d8..6aa558f2e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcreteTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcreteTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class AuthorInheritanceConcreteTable extends AuthorTable
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class AuthorInheritanceConcreteTable extends \AuthorTable
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceTable.class.php
index a13d7d811..3306e9435 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class AuthorInheritanceTable extends AuthorTable
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class AuthorInheritanceTable extends \AuthorTable
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
index 7f9b9a52e..6f4674d7e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
@@ -1,8 +1,18 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class AuthorTable extends Doctrine_Table
+class AuthorTable extends \Doctrine_Table
 {
     public function testTableMethod()
     {
@@ -11,7 +21,7 @@ public function testTableMethod()
         ;
     }
 
-    public function testTableMethod2(Doctrine_Query $q)
+    public function testTableMethod2(\Doctrine_Query $q)
     {
         $q->addWhere('a.id > 0');
 
@@ -24,7 +34,7 @@ public function getChoices($limit = null)
         if (null !== $limit) {
             $q->limit($limit);
         }
-        $choices = array();
+        $choices = [];
 
         foreach ($q->fetchArray() as $author) {
             $choices[$author['id']] = $author['name'];
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
index 7ca686f8f..fdc4b8ea9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogArticle.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class BlogArticle extends BaseBlogArticle
+class BlogArticle extends \BaseBlogArticle
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticleTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticleTable.class.php
index b78d84291..4d3301f63 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticleTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticleTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class BlogArticleTable extends ArticleTable
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class BlogArticleTable extends \ArticleTable
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
index b722f1b83..543df5aaf 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * BlogAuthor.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class BlogAuthor extends BaseBlogAuthor
+class BlogAuthor extends \BaseBlogAuthor
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthorTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthorTable.class.php
index 5187e85cc..228b962be 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthorTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthorTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class BlogAuthorTable extends AuthorTable
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class BlogAuthorTable extends \AuthorTable
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
index fcb14295a..fac7c1cf8 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * CamelCase.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class CamelCase extends BaseCamelCase
+class CamelCase extends \BaseCamelCase
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCaseTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCaseTable.class.php
index 1b19bd7a3..62d2dbe32 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCaseTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCaseTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class CamelCaseTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class CamelCaseTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
index 5b1334bfe..e89a6b4c6 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * DefaultValueTest.
  *
@@ -13,6 +22,6 @@
  *
  * @coversNothing
  */
-class DefaultValueTest extends BaseDefaultValueTest
+class DefaultValueTest extends \BaseDefaultValueTest
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTestTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTestTable.class.php
index 5ff964b04..2c74571b4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTestTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTestTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class DefaultValueTestTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class DefaultValueTestTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
index fbdf65787..f6b250adf 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * FormGeneratorTest.
  *
@@ -13,6 +22,6 @@
  *
  * @coversNothing
  */
-class FormGeneratorTest extends BaseFormGeneratorTest
+class FormGeneratorTest extends \BaseFormGeneratorTest
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
index a16d4bdfd..df04d2ce4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * FormGeneratorTest2.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class FormGeneratorTest2 extends BaseFormGeneratorTest2
+class FormGeneratorTest2 extends \BaseFormGeneratorTest2
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2Table.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2Table.class.php
index 9ad271589..0f8d0a8d2 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2Table.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2Table.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class FormGeneratorTest2Table extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class FormGeneratorTest2Table extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3.class.php
index d7bb14b74..24f9e64d0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * FormGeneratorTest3.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id: Builder.php 6716 2009-11-12 19:26:28Z jwage $
  */
-class FormGeneratorTest3 extends BaseFormGeneratorTest3
+class FormGeneratorTest3 extends \BaseFormGeneratorTest3
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3Table.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3Table.class.php
index 2dc523cf3..5d35054d9 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3Table.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest3Table.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class FormGeneratorTest3Table extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class FormGeneratorTest3Table extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTestTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTestTable.class.php
index fcf912825..2cd435916 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTestTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTestTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class FormGeneratorTestTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class FormGeneratorTestTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Group.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Group.class.php
index 75353df89..603abee9f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Group.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Group.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class Group extends BaseGroup
+class Group extends \BaseGroup
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermission.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermission.class.php
index 2431abf82..c35736723 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermission.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermission.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class GroupPermission extends BaseGroupPermission
+class GroupPermission extends \BaseGroupPermission
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermissionTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermissionTable.class.php
index 6560189fd..76a5d42ea 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermissionTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupPermissionTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class GroupPermissionTable extends Doctrine_Table
+class GroupPermissionTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupTable.class.php
index fb976ba54..b90d238dd 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/GroupTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class GroupTable extends Doctrine_Table
+class GroupTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
index 50c059062..97d9286de 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ModelFromLinkedSchema.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class ModelFromLinkedSchema extends BaseModelFromLinkedSchema
+class ModelFromLinkedSchema extends \BaseModelFromLinkedSchema
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchemaTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchemaTable.class.php
index 6a9b8f112..470d87c62 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchemaTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchemaTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class ModelFromLinkedSchemaTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class ModelFromLinkedSchemaTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumn.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumn.class.php
index 30b9f56b0..1db726f61 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumn.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumn.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ModelWithNumberInColumn.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id: Builder.php 6820 2009-11-30 17:27:49Z jwage $
  */
-class ModelWithNumberInColumn extends BaseModelWithNumberInColumn
+class ModelWithNumberInColumn extends \BaseModelWithNumberInColumn
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumnTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumnTable.class.php
index 1b33a90c6..4c664afdb 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumnTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelWithNumberInColumnTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class ModelWithNumberInColumnTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class ModelWithNumberInColumnTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Permission.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Permission.class.php
index dcc385d3b..4c6745247 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Permission.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Permission.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class Permission extends BasePermission
+class Permission extends \BasePermission
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/PermissionTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/PermissionTable.class.php
index c4bc9ff97..ef70ada1a 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/PermissionTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/PermissionTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class PermissionTable extends Doctrine_Table
+class PermissionTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Profile.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Profile.class.php
index 332342756..850d7e99e 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Profile.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Profile.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class Profile extends BaseProfile
+class Profile extends \BaseProfile
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ProfileTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ProfileTable.class.php
index c2c9474f5..f032e517b 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ProfileTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ProfileTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class ProfileTable extends Doctrine_Table
+class ProfileTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
index 68ad86ec5..0e5193491 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * ResourceType.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class ResourceType extends BaseResourceType
+class ResourceType extends \BaseResourceType
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceTypeTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceTypeTable.class.php
index 18ac9fcf3..f91376937 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceTypeTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceTypeTable.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class ResourceTypeTable extends Doctrine_Table
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class ResourceTypeTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
index b69958cb9..ba4737a93 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Setting.
  *
@@ -9,6 +18,6 @@
  *
  * @version    SVN: $Id$
  */
-class Setting extends PluginSetting
+class Setting extends \PluginSetting
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/SettingTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/SettingTable.class.php
index ef147fec2..57f45ff3d 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/SettingTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/SettingTable.class.php
@@ -1,9 +1,18 @@
 <?php
 
-class SettingTable extends PluginSettingTable
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class SettingTable extends \PluginSettingTable
 {
     public static function getInstance()
     {
-        return Doctrine_Core::getTable('Setting');
+        return \Doctrine_Core::getTable('Setting');
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Subscription.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Subscription.class.php
index 2e9ed9c8d..9ccc50d55 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Subscription.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Subscription.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class Subscription extends BaseSubscription
+class Subscription extends \BaseSubscription
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SubscriptionTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SubscriptionTable.class.php
index 054e0c3c0..bc59781b6 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SubscriptionTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SubscriptionTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class SubscriptionTable extends Doctrine_Table
+class SubscriptionTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTest.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTest.class.php
index 667cf2c05..4c874aaa4 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTest.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTest.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  *
@@ -7,6 +16,6 @@
  *
  * @coversNothing
  */
-class UniqueTest extends BaseUniqueTest
+class UniqueTest extends \BaseUniqueTest
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTestTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTestTable.class.php
index 70a0fd660..2ac9a0978 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTestTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UniqueTestTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class UniqueTestTable extends Doctrine_Table
+class UniqueTestTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/User.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/User.class.php
index 70b2d8889..7941fd27f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/User.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/User.class.php
@@ -1,9 +1,18 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class User extends BaseUser
+class User extends \BaseUser
 {
     public function setPassword($password)
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroup.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroup.class.php
index 5253c65af..dabec7859 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroup.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroup.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class UserGroup extends BaseUserGroup
+class UserGroup extends \BaseUserGroup
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroupTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroupTable.class.php
index c13b5f8c7..9e8484d46 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroupTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserGroupTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class UserGroupTable extends Doctrine_Table
+class UserGroupTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermission.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermission.class.php
index 3cd3d6990..7d1771d89 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermission.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermission.class.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class UserPermission extends BaseUserPermission
+class UserPermission extends \BaseUserPermission
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermissionTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermissionTable.class.php
index a184d2fb0..9d3ba5287 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermissionTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserPermissionTable.class.php
@@ -1,7 +1,17 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class UserPermissionTable extends Doctrine_Table
+class UserPermissionTable extends \Doctrine_Table
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserTable.class.php
index 4a7c5d4c0..0e06049ca 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/UserTable.class.php
@@ -1,8 +1,18 @@
 <?php
+
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * This class has been auto-generated by the Doctrine ORM Framework.
  */
-class UserTable extends Doctrine_Table
+class UserTable extends \Doctrine_Table
 {
     public function widgetChoiceTableMethod1()
     {
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/myDoctrineRecord.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/myDoctrineRecord.class.php
index e4c7f680f..36514bdc5 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/myDoctrineRecord.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/myDoctrineRecord.class.php
@@ -1,5 +1,14 @@
 <?php
 
-abstract class myDoctrineRecord extends sfDoctrineRecord
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+abstract class myDoctrineRecord extends \sfDoctrineRecord
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
index 97c0b3383..d50911f74 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
@@ -1,12 +1,14 @@
 <?php
 
-/**
- * PluginSetting form.
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     ##AUTHOR_NAME##
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    SVN: $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-abstract class PluginSettingFormFilter extends BaseSettingFormFilter
+
+abstract class PluginSettingFormFilter extends \BaseSettingFormFilter
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
index 5c2c5e8bc..c9a83ed6a 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
@@ -1,12 +1,14 @@
 <?php
 
-/**
- * PluginSetting form.
+/*
+ * This file is part of the Symfony1 package.
  *
- * @author     ##AUTHOR_NAME##
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @version    SVN: $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-abstract class PluginSettingForm extends BaseSettingForm
+
+abstract class PluginSettingForm extends \BaseSettingForm
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
index a61eec69b..076a5a9d6 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
@@ -1,14 +1,14 @@
 <?php
 
-/**
- * PluginSetting.
+/*
+ * This file is part of the Symfony1 package.
  *
- * This class has been auto-generated by the Doctrine ORM Framework
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
- * @author     ##NAME## <##EMAIL##>
- *
- * @version    SVN: $Id$
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-abstract class PluginSetting extends BaseSetting
+
+abstract class PluginSetting extends \BaseSetting
 {
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSettingTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSettingTable.class.php
index c8272056c..ab46c7bd8 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSettingTable.class.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSettingTable.class.php
@@ -1,11 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * PluginSettingTable.
  *
  * This class has been auto-generated by the Doctrine ORM Framework
  */
-class PluginSettingTable extends Doctrine_Table
+class PluginSettingTable extends \Doctrine_Table
 {
     /**
      * Returns an instance of this class.
@@ -14,6 +23,6 @@ class PluginSettingTable extends Doctrine_Table
      */
     public static function getInstance()
     {
-        return Doctrine_Core::getTable('PluginSetting');
+        return \Doctrine_Core::getTable('PluginSetting');
     }
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php b/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
index 31f52561b..c06f43927 100644
--- a/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,12 +14,12 @@
 
 require_once dirname(__FILE__).'/../bootstrap/functional.php';
 
-$t = new lime_test(22);
+$t = new \lime_test(22);
 
-$authors = Doctrine_Core::getTable('Author')->findAll();
+$authors = \Doctrine_Core::getTable('Author')->findAll();
 $t->is(count($authors), 2);
 
-$author = new Author();
+$author = new \Author();
 
 // Accessor overriding
 $author->setName('Jonathan H. Wage');
@@ -32,10 +33,10 @@
 $t->is($author->getId(), 1);
 
 // Make sure we still have only 2 authors
-$authors = Doctrine_Core::getTable('Author')->findAll();
+$authors = \Doctrine_Core::getTable('Author')->findAll();
 $t->is(count($authors), 2);
 
-$article = new Article();
+$article = new \Article();
 $article->title = 'test';
 
 // __toString() automatic column finder
@@ -49,7 +50,7 @@
 $t->is($article->getauthor_id(), $article->author_id);
 
 // Camel case columns
-$camelCase = new CamelCase();
+$camelCase = new \CamelCase();
 $camelCase->testCamelCase = 'camel';
 $camelCase->setTestCamelCase('camel');
 
@@ -74,11 +75,11 @@
 try {
     $article->getDateTimeObject('author_id');
     $t->fail();
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass();
 }
 
-$article->setDateTimeObject('created_at', new DateTime('1985-09-01'));
+$article->setDateTimeObject('created_at', new \DateTime('1985-09-01'));
 $t->is($article->getDateTimeObject('created_at')->format('m/d/Y'), '09/01/1985');
 
 $article->setDateTimeObject('created_at', null);
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
index e27dc6668..e8b01ce58 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormDoctrineTest.php
@@ -1,29 +1,38 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(13);
+$t = new \lime_test(13);
 
 // ->__construct()
 $t->diag('->__construct()');
 
-class NumericFieldForm extends ArticleForm
+class NumericFieldForm extends \ArticleForm
 {
     public function configure()
     {
-        $this->widgetSchema[1] = new sfWidgetFormInputText();
-        $this->validatorSchema[1] = new sfValidatorPass();
+        $this->widgetSchema[1] = new \sfWidgetFormInputText();
+        $this->validatorSchema[1] = new \sfValidatorPass();
         $this->setDefault(1, '==DEFAULT_VALUE==');
     }
 }
 
-$form = new NumericFieldForm();
+$form = new \NumericFieldForm();
 $defaults = $form->getDefaults();
 $t->is($defaults[1], '==DEFAULT_VALUE==', '->__construct() allows ->configure() to set defaults on numeric fields');
 
-class DefaultValuesForm extends AuthorForm
+class DefaultValuesForm extends \AuthorForm
 {
     public function configure()
     {
@@ -31,32 +40,32 @@ public function configure()
     }
 }
 
-$author = new Author();
-$form = new DefaultValuesForm($author);
+$author = new \Author();
+$form = new \DefaultValuesForm($author);
 $t->is($form->getDefault('name'), 'John Doe', '->__construct() uses form defaults for new objects');
 
-$author = new Author();
+$author = new \Author();
 $author->name = 'Jacques Doe';
 $author->save();
-$form = new DefaultValuesForm($author);
+$form = new \DefaultValuesForm($author);
 $t->is($form->getDefault('name'), 'Jacques Doe', '->__construct() uses object value as a default for existing objects');
 $author->delete();
 
 // ->embedRelation()
 $t->diag('->embedRelation()');
 
-class myArticleForm extends ArticleForm
+class myArticleForm extends \ArticleForm
 {
 }
 
-$table = Doctrine_Core::getTable('Author');
-$form = new AuthorForm($table->create(array(
-    'Articles' => array(
-        array('title' => 'Article 1'),
-        array('title' => 'Article 2'),
-        array('title' => 'Article 3'),
-    ),
-)));
+$table = \Doctrine_Core::getTable('Author');
+$form = new \AuthorForm($table->create([
+    'Articles' => [
+        ['title' => 'Article 1'],
+        ['title' => 'Article 2'],
+        ['title' => 'Article 3'],
+    ],
+]));
 
 $form->embedRelation('Articles');
 $embeddedForms = $form->getEmbeddedForms();
@@ -64,34 +73,34 @@ class myArticleForm extends ArticleForm
 $t->ok(isset($form['Articles']), '->embedRelation() embeds forms');
 $t->is(count($embeddedForms['Articles']), 3, '->embedRelation() embeds one form for each related object');
 
-$form->embedRelation('Articles', 'myArticleForm', array(array('test' => true)));
+$form->embedRelation('Articles', 'myArticleForm', [['test' => true]]);
 $embeddedForms = $form->getEmbeddedForms();
 $moreEmbeddedForms = $embeddedForms['Articles']->getEmbeddedForms();
 $t->isa_ok($moreEmbeddedForms[0], 'myArticleForm', '->embedRelation() accepts a form class argument');
 $t->ok($moreEmbeddedForms[0]->getOption('test'), '->embedRelation() accepts a form arguments argument');
 
-$form = new AuthorForm($table->create(array(
-    'Articles' => array(
-        array('title' => 'Article 1'),
-        array('title' => 'Article 2'),
-    ),
-)));
+$form = new \AuthorForm($table->create([
+    'Articles' => [
+        ['title' => 'Article 1'],
+        ['title' => 'Article 2'],
+    ],
+]));
 $form->embedRelation('Articles as author_articles');
 $t->is(isset($form['author_articles']), true, '->embedRelation() embeds using an alias');
 $t->is(count($form['author_articles']), 2, '->embedRelation() embeds one form for each related object using an alias');
 
-$form = new AuthorForm($table->create(array(
-    'Articles' => array(
-        array('title' => 'Article 1'),
-        array('title' => 'Article 2'),
-    ),
-)));
+$form = new \AuthorForm($table->create([
+    'Articles' => [
+        ['title' => 'Article 1'],
+        ['title' => 'Article 2'],
+    ],
+]));
 $form->embedRelation('Articles AS author_articles');
 $t->is(isset($form['author_articles']), true, '->embedRelation() embeds using an alias with a case insensitive separator');
 
-$form = new ArticleForm(Doctrine_Core::getTable('Article')->create(array(
-    'Author' => array('name' => 'John Doe'),
-)));
+$form = new \ArticleForm(\Doctrine_Core::getTable('Article')->create([
+    'Author' => ['name' => 'John Doe'],
+]));
 $form->embedRelation('Author');
 $t->is(isset($form['Author']), true, '->embedRelation() embeds a ONE type relation');
 $t->is(isset($form['Author']['name']), true, '->embedRelation() embeds a ONE type relation');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php
index 37cee1a2e..96ac7d650 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/form/sfFormFilterDoctrineTest.php
@@ -1,30 +1,39 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(16);
+$t = new \lime_test(16);
 
-class TestFormFilter extends ArticleFormFilter
+class TestFormFilter extends \ArticleFormFilter
 {
-    public $processedFields = array();
+    public $processedFields = [];
 
     public function configure()
     {
-        $this->setWidgets(array(
-            'name' => new sfWidgetFormInputText(),
-            'nomethod_bc' => new sfWidgetFormInputText(),
-            'nomethod' => new sfWidgetFormInputText(),
-            'author_id' => new sfWidgetFormInputText(),
-        ));
-
-        $this->setValidators(array(
-            'name' => new sfValidatorPass(),
-            'nomethod_bc' => new sfValidatorPass(),
-            'nomethod' => new sfValidatorPass(),
-            'author_id' => new sfValidatorPass(),
-        ));
+        $this->setWidgets([
+            'name' => new \sfWidgetFormInputText(),
+            'nomethod_bc' => new \sfWidgetFormInputText(),
+            'nomethod' => new \sfWidgetFormInputText(),
+            'author_id' => new \sfWidgetFormInputText(),
+        ]);
+
+        $this->setValidators([
+            'name' => new \sfValidatorPass(),
+            'nomethod_bc' => new \sfValidatorPass(),
+            'nomethod' => new \sfValidatorPass(),
+            'author_id' => new \sfValidatorPass(),
+        ]);
     }
 
     public function addNameColumnQuery($query, $field, $value)
@@ -34,98 +43,98 @@ public function addNameColumnQuery($query, $field, $value)
 
     public function getFields()
     {
-        return array_merge(parent::getFields(), array(
+        return array_merge(parent::getFields(), [
             'body' => 'Invalid',
             'nomethod_bc' => 'Text',
             'author_id' => 'Number',
-        ));
+        ]);
     }
 }
 
 $t->diag('->getQuery()');
 
-$filter = new ArticleFormFilter();
-$filter->bind(array());
+$filter = new \ArticleFormFilter();
+$filter->bind([]);
 $t->isa_ok($filter->getQuery(), 'Doctrine_Query', '->getQuery() returns a Doctrine_Query object');
 
-$query = Doctrine_Query::create()->select('title, body');
+$query = \Doctrine_Query::create()->select('title, body');
 
-$filter = new ArticleFormFilter(array(), array('query' => $query));
-$filter->bind(array());
-$t->is_deeply($filter->getQuery()->getDqlPart('select'), array('title, body'), '->getQuery() uses the query option');
+$filter = new \ArticleFormFilter([], ['query' => $query]);
+$filter->bind([]);
+$t->is_deeply($filter->getQuery()->getDqlPart('select'), ['title, body'], '->getQuery() uses the query option');
 $t->ok($filter->getQuery() !== $query, '->getQuery() clones the query option');
 
 // BC with symfony 1.2
-$filter = new TestFormFilter();
-$filter->bind(array('nomethod_bc' => 'nomethod_bc'));
+$filter = new \TestFormFilter();
+$filter->bind(['nomethod_bc' => 'nomethod_bc']);
 
 try {
     $filter->getQuery();
     $t->fail('->getQuery() throws an exception if a field that is not a real column is specified in getFields() but a column method does not exist');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getQuery() throws an exception if a field that is not a real column is specified in getFields() but a column method does not exist');
 }
 
 // BC with symfony 1.2
-$filter = new TestFormFilter();
-$filter->bind(array('body' => 'body'));
+$filter = new \TestFormFilter();
+$filter->bind(['body' => 'body']);
 
 try {
     $filter->getQuery();
     $t->fail('->getQuery() throws an exception if a field is a real column and neither a column nor type method exists');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getQuery() throws an exception if a field is a real column and neither a column nor type method exists');
 }
 
 // BC with symfony 1.2
-$filter = new TestFormFilter();
-$filter->bind(array('nomethod' => 'nomethod'));
+$filter = new \TestFormFilter();
+$filter->bind(['nomethod' => 'nomethod']);
 
 try {
     $filter->getQuery();
     $t->pass('->getQuery() does not throw an exception when a value without a query method is passed');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('->getQuery() does not throw an exception when a value without a query method is passed');
 }
 
 // new in symfony 1.3
-$filter = new TestFormFilter();
-$filter->bind(array('name' => 'Kris Wallsmith'));
+$filter = new \TestFormFilter();
+$filter->bind(['name' => 'Kris Wallsmith']);
 $filter->getQuery();
-$t->is_deeply($filter->processedFields, array('name'), '->getQuery() processes fields not specified in getFields()');
+$t->is_deeply($filter->processedFields, ['name'], '->getQuery() processes fields not specified in getFields()');
 
 // pass 0 to number filter
-$filter = new TestFormFilter();
-$filter->bind(array('author_id' => array('text' => 0)));
+$filter = new \TestFormFilter();
+$filter->bind(['author_id' => ['text' => 0]]);
 $query = $filter->getQuery();
 $t->is(trim($query->getDql()), 'FROM Article r WHERE r.author_id = ?', '->getQuery() filters by a 0 number');
-$t->is($query->getFlattenedParams(), array(0), '->getQuery() filters by a 0 number');
+$t->is($query->getFlattenedParams(), [0], '->getQuery() filters by a 0 number');
 
-$filter = new ArticleFormFilter();
-$filter->bind(array('type' => array('is_empty' => '1', 'text' => '')));
+$filter = new \ArticleFormFilter();
+$filter->bind(['type' => ['is_empty' => '1', 'text' => '']]);
 $query = $filter->getQuery();
 $t->is(trim($query->getDql()), 'FROM Article r WHERE (r.type IS NULL OR r.type = ?)', '->getQuery() tests for null or empty text fields');
-$t->is($query->getFlattenedParams(), array(''), '->getQuery() tests for null or empty text fields');
+$t->is($query->getFlattenedParams(), [''], '->getQuery() tests for null or empty text fields');
 
-$filter = new ArticleFormFilter();
-$filter->bind(array('views' => array('is_empty' => '1', 'text' => '')));
+$filter = new \ArticleFormFilter();
+$filter->bind(['views' => ['is_empty' => '1', 'text' => '']]);
 $query = $filter->getQuery();
 $t->is(trim($query->getDql()), 'FROM Article r WHERE (r.views IS NULL OR r.views = ?)', '->getQuery() tests for null or empty number fields');
-$t->is($query->getFlattenedParams(), array(''), '->getQuery() tests for null or empty number fields');
+$t->is($query->getFlattenedParams(), [''], '->getQuery() tests for null or empty number fields');
 
 $t->diag('->setTableMethod()');
 
-$filter = new ArticleFormFilter();
+$filter = new \ArticleFormFilter();
 $filter->setTableMethod('getNewQuery');
-$filter->bind(array());
-$t->is_deeply($filter->getQuery()->getDqlPart('select'), array('title, body'), '->setTableMethod() specifies a method that can return a new query');
+$filter->bind([]);
+$t->is_deeply($filter->getQuery()->getDqlPart('select'), ['title, body'], '->setTableMethod() specifies a method that can return a new query');
 
-$filter = new ArticleFormFilter();
+$filter = new \ArticleFormFilter();
 $filter->setTableMethod('filterSuppliedQuery');
-$filter->bind(array());
-$t->is_deeply($filter->getQuery()->getDqlPart('select'), array('title, body'), '->setTableMethod() specifies a method that can modify the supplied query');
+$filter->bind([]);
+$t->is_deeply($filter->getQuery()->getDqlPart('select'), ['title, body'], '->setTableMethod() specifies a method that can modify the supplied query');
 
-$filter = new ArticleFormFilter();
+$filter = new \ArticleFormFilter();
 $filter->setTableMethod('filterSuppliedQueryAndReturn');
-$filter->bind(array());
-$t->is_deeply($filter->getQuery()->getDqlPart('select'), array('title, body'), '->setTableMethod() specifies a method that can modify and return the supplied query');
+$filter->bind([]);
+$t->is_deeply($filter->getQuery()->getDqlPart('select'), ['title, body'], '->setTableMethod() specifies a method that can modify and return the supplied query');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
index 55c91293f..b53fa6ac0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/pager/sfDoctrinePagerTest.php
@@ -1,18 +1,27 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 $fixtures = 'fixtures/pager.yml';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
 // ->getResults()
 $t->diag('->getResults()');
 
-$query = Doctrine_Core::getTable('Article')->createQuery();
-$query->setHydrationMode(Doctrine_Core::HYDRATE_NONE);
-$pager = new sfDoctrinePager('Article', 10);
+$query = \Doctrine_Core::getTable('Article')->createQuery();
+$query->setHydrationMode(\Doctrine_Core::HYDRATE_NONE);
+$pager = new \sfDoctrinePager('Article', 10);
 $pager->setQuery($query);
 $pager->init();
 $t->isa_ok($pager->getResults(), 'array', '->getResults() uses the hydration mode set on the query');
@@ -20,22 +29,22 @@
 // ->getNbResults()
 $t->diag('->getNbResults()');
 
-$pager = new sfDoctrinePager('Article', 10);
+$pager = new \sfDoctrinePager('Article', 10);
 $pager->init();
-$count = Doctrine_Core::getTable('Article')->createQuery()->count();
+$count = \Doctrine_Core::getTable('Article')->createQuery()->count();
 $t->is($pager->getNbResults(), $count, '->getNbResults() returns the number of results');
 
 // Countable interface
 $t->diag('Countable interface');
 
-$pager = new sfDoctrinePager('Article', 10);
+$pager = new \sfDoctrinePager('Article', 10);
 $pager->init();
 $t->is(count($pager), $pager->getNbResults(), '"Countable" interface returns the total number of objects');
 
 // Iterator interface
 $t->diag('Iterator interface');
 
-$pager = new sfDoctrinePager('Article', 10);
+$pager = new \sfDoctrinePager('Article', 10);
 $pager->init();
 $normal = 0;
 $iterated = 0;
@@ -49,13 +58,13 @@
 
 // ->setTableMethod()
 $t->diag('->setTableMethod()');
-$pager = new sfDoctrinePager('Article', 10);
+$pager = new \sfDoctrinePager('Article', 10);
 $pager->setTableMethod('addOnHomepage');
 $pager->init();
-$t->is($pager->getNbResults(), count(Doctrine_Core::getTable('Article')->findByIsOnHomepage('1')), '->setTableMethod() update the query');
+$t->is($pager->getNbResults(), count(\Doctrine_Core::getTable('Article')->findByIsOnHomepage('1')), '->setTableMethod() update the query');
 
 // Serialization test for defect #7987
 $t->diag('Serialization');
 $pager = unserialize(serialize($pager));
 $pager->init();
-$t->is($pager->getNbResults(), count(Doctrine_Core::getTable('Article')->findByIsOnHomepage('1')), 'serialization preserves TableMethod functionality');
+$t->is($pager->getNbResults(), count(\Doctrine_Core::getTable('Article')->findByIsOnHomepage('1')), 'serialization preserves TableMethod functionality');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
index 52d19518e..f9eeb793d 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/record/sfDoctrineRecordTest.php
@@ -1,36 +1,45 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
 // ->__construct()
 $t->diag('->__construct()');
 
 function is_symfony_i18n_filter($filter)
 {
-    return $filter instanceof sfDoctrineRecordI18nFilter;
+    return $filter instanceof \sfDoctrineRecordI18nFilter;
 }
 
-$table = Doctrine_Core::getTable('Article');
-new Article();
+$table = \Doctrine_Core::getTable('Article');
+new \Article();
 $t->is(count(array_filter($table->getFilters(), 'is_symfony_i18n_filter')), 1, '->__construct() adds i18n filter');
-new Article();
+new \Article();
 $t->is(count(array_filter($table->getFilters(), 'is_symfony_i18n_filter')), 1, '->__construct() adds i18n filter once');
 
 // ->serialize() ->unserialize()
 $t->diag('->serialize() ->unserialize()');
 
-$before = new Author();
+$before = new \Author();
 $before->name = 'test';
 $serialized = serialize($before);
 $after = unserialize($serialized);
 $t->is($after->name, 'test', '->unserialize() maintains field values');
 
-$conn = Doctrine_Manager::getInstance()->getConnectionForComponent('Author');
-$before = new Author();
+$conn = \Doctrine_Manager::getInstance()->getConnectionForComponent('Author');
+$before = new \Author();
 $before->name = 'test';
 $serialized = serialize($before);
 $conn->clear();
@@ -38,14 +47,14 @@ function is_symfony_i18n_filter($filter)
 $after = unserialize($serialized);
 $t->is($after->name, 'test', '->unserialize() maintains field values upon reset');
 
-$before = new Article();
+$before = new \Article();
 $before->title = 'test';
 $serialized = serialize($before);
 $after = unserialize($serialized);
 $t->is($after->title, 'test', '->unserialize() maintains field values on I18n records');
 
-$conn = Doctrine_Manager::getInstance()->getConnectionForComponent('Article');
-$before = new Article();
+$conn = \Doctrine_Manager::getInstance()->getConnectionForComponent('Article');
+$before = new \Article();
 $before->title = 'test';
 $serialized = serialize($before);
 $conn->clear();
@@ -53,15 +62,15 @@ function is_symfony_i18n_filter($filter)
 $after = unserialize($serialized);
 $t->is($after->title, 'test', '->unserialize() maintains field values on I18n records upon reset');
 
-$article = new Article();
+$article = new \Article();
 
 try {
-    $article->setAuthor(new stdClass());
-} catch (Exception $e) {
+    $article->setAuthor(new \stdClass());
+} catch (\Exception $e) {
     $t->is($e->getMessage(), 'Couldn\'t call Doctrine_Core::set(), second argument should be an instance of Doctrine_Record or Doctrine_Null when setting one-to-one references.', 'Making sure proper exception message is thrown');
 }
 
-$article = new Article();
+$article = new \Article();
 $article->title = 'testing this out';
 $serialized = serialize($article);
 $article = unserialize($serialized);
@@ -69,11 +78,11 @@ function is_symfony_i18n_filter($filter)
 $t->is($article->getTitle(), 'testing this out', 'Making sure getTitle() is still accessible after unserializing');
 
 try {
-    $test = new ModelWithNumberInColumn();
+    $test = new \ModelWithNumberInColumn();
     $test->getColumn_1();
     $test->getColumn_2();
     $test->getColumn__3();
     $t->pass('Make sure __call() handles fields with *_(n) in the field name');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('__call() failed in sfDoctrineRecord');
 }
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php
index 5afb950f2..e673e45ae 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineColumnTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,35 +11,35 @@
 
 include dirname(__FILE__).'/../bootstrap/unit.php';
 
-$t = new lime_test(23);
+$t = new \lime_test(23);
 
-$conn = Doctrine_Manager::connection(new Doctrine_Adapter_Mock('mysql'));
+$conn = \Doctrine_Manager::connection(new \Doctrine_Adapter_Mock('mysql'));
 
 /**
  * @internal
  *
  * @coversNothing
  */
-class Test extends sfDoctrineRecord
+class Test extends \sfDoctrineRecord
 {
     public function setUp()
     {
-        $this->hasMany('TestRelation as TestRelations', array('local' => 'id', 'foreign' => 'test_id'));
+        $this->hasMany('TestRelation as TestRelations', ['local' => 'id', 'foreign' => 'test_id']);
     }
 
     public function setTableDefinition()
     {
-        $this->hasColumn('name', 'string', 255, array('notblank' => true));
+        $this->hasColumn('name', 'string', 255, ['notblank' => true]);
         $this->hasColumn('test as TEST', 'string', 255);
-        $this->hasColumn('email', 'string', 255, array('email' => true, 'notnull' => true));
+        $this->hasColumn('email', 'string', 255, ['email' => true, 'notnull' => true]);
     }
 }
 
-class TestRelation extends sfDoctrineRecord
+class TestRelation extends \sfDoctrineRecord
 {
     public function setUp()
     {
-        $this->hasOne('Test', array('local' => 'test_id', 'foreign' => 'id'));
+        $this->hasOne('Test', ['local' => 'test_id', 'foreign' => 'id']);
     }
 
     public function setTableDefinition()
@@ -48,13 +49,13 @@ public function setTableDefinition()
     }
 }
 
-$column = new sfDoctrineColumn('name', Doctrine_Core::getTable('Test'));
+$column = new \sfDoctrineColumn('name', \Doctrine_Core::getTable('Test'));
 $t->is($column->getName(), 'name');
 $t->is($column->getFieldName(), 'name');
 $t->is($column->getPhpName(), 'name');
 $t->is($column->isNotNull(), true);
 
-$column = new sfDoctrineColumn('test', Doctrine_Core::getTable('Test'));
+$column = new \sfDoctrineColumn('test', \Doctrine_Core::getTable('Test'));
 $t->is($column->getName(), 'test');
 $t->is($column->getFieldName(), 'TEST');
 $t->is($column->getPhpName(), 'TEST');
@@ -68,17 +69,17 @@ public function setTableDefinition()
 $t->is($column->isNotNull(), false);
 
 // Is not null and has definition key
-$column = new sfDoctrineColumn('email', Doctrine_Core::getTable('Test'));
+$column = new \sfDoctrineColumn('email', \Doctrine_Core::getTable('Test'));
 $t->is($column->isNotNull(), true);
 $t->is($column->hasDefinitionKey('email'), true);
 $t->is($column->getDefinitionKey('email'), true);
 
 // Is primary key
-$column = new sfDoctrineColumn('id', Doctrine_Core::getTable('Test'));
+$column = new \sfDoctrineColumn('id', \Doctrine_Core::getTable('Test'));
 $t->is($column->isPrimaryKey(), true);
 
 // Relation/foreign key functions
-$column = new sfDoctrineColumn('test_id', Doctrine_Core::getTable('TestRelation'));
+$column = new \sfDoctrineColumn('test_id', \Doctrine_Core::getTable('TestRelation'));
 $t->is($column->isForeignKey(), true);
 $t->is($column->getForeignClassName(), 'Test');
 $t->is($column->getForeignTable()->getOption('name'), 'Test');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
index c6e2be61a..5473d994f 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/sfDoctrineDatabaseTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,26 +11,26 @@
 
 include dirname(__FILE__).'/../bootstrap/unit.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
 }
 
-$configuration = new ProjectConfiguration(dirname(__FILE__).'/../../lib', new sfEventDispatcher());
+$configuration = new \ProjectConfiguration(dirname(__FILE__).'/../../lib', new \sfEventDispatcher());
 
-$parameters = array(
+$parameters = [
     'name' => 'doctrine',
     'dsn' => 'sqlite::memory',
-    'attributes' => array(
+    'attributes' => [
         'use_native_enum' => true,
         'validate' => 'all',
         'tblname_format' => 'test_%s',
-    ),
-);
+    ],
+];
 
-$p = new sfDoctrineDatabase($parameters);
+$p = new \sfDoctrineDatabase($parameters);
 $t->is($p->getDoctrineConnection()->getName(), 'doctrine', 'initialize() - creates a valid doctrine configuration from parameters');
-$t->is($p->getDoctrineConnection()->getAttribute(Doctrine_Core::ATTR_USE_NATIVE_ENUM), true, 'initialize() - setups doctrine attributes - attribute value is not a string');
-$t->is($p->getDoctrineConnection()->getAttribute(Doctrine_Core::ATTR_VALIDATE), Doctrine_Core::VALIDATE_ALL, 'initialize() - setups doctrine attributes - attribute value is a string and constant exists');
-$t->is($p->getDoctrineConnection()->getAttribute(Doctrine_Core::ATTR_TBLNAME_FORMAT), $parameters['attributes']['tblname_format'], 'initialize() - setups doctrine attributes - attribute value is a string and constant not exists');
+$t->is($p->getDoctrineConnection()->getAttribute(\Doctrine_Core::ATTR_USE_NATIVE_ENUM), true, 'initialize() - setups doctrine attributes - attribute value is not a string');
+$t->is($p->getDoctrineConnection()->getAttribute(\Doctrine_Core::ATTR_VALIDATE), \Doctrine_Core::VALIDATE_ALL, 'initialize() - setups doctrine attributes - attribute value is a string and constant exists');
+$t->is($p->getDoctrineConnection()->getAttribute(\Doctrine_Core::ATTR_TBLNAME_FORMAT), $parameters['attributes']['tblname_format'], 'initialize() - setups doctrine attributes - attribute value is a string and constant not exists');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php
index 4658894e4..8c49d0811 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/validator/sfValidatorDoctrineChoiceTest.php
@@ -1,19 +1,28 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // ->clean()
 $t->diag('->clean()');
 
-$query = Doctrine_Core::getTable('Author')->createQuery();
-$validator = new sfValidatorDoctrineChoice(array('model' => 'Author', 'query' => $query));
+$query = \Doctrine_Core::getTable('Author')->createQuery();
+$validator = new \sfValidatorDoctrineChoice(['model' => 'Author', 'query' => $query]);
 
-$author = Doctrine_Core::getTable('Author')->createQuery()->limit(1)->fetchOne();
+$author = \Doctrine_Core::getTable('Author')->createQuery()->limit(1)->fetchOne();
 $validator->clean($author->id);
 
 $t->is(trim($query->getDql()), 'FROM Author', '->clean() does not change the supplied query object');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
index c1fbba70d..89c1101e0 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
@@ -1,19 +1,28 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
 // ->getChoices()
 $t->diag('->getChoices()');
 
-$validator = new sfWidgetFormDoctrineArrayChoice(array('model' => 'Author', 'table_method' => 'getChoices'));
+$validator = new \sfWidgetFormDoctrineArrayChoice(['model' => 'Author', 'table_method' => 'getChoices']);
 
-$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'), '->getChoices() returns choices');
+$t->is_deeply($validator->getChoices(), [1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'], '->getChoices() returns choices');
 
-$validator->setOption('table_method_params', array(1));
+$validator->setOption('table_method_params', [1]);
 
-$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage'), '->getChoices() returns limited choices');
+$t->is_deeply($validator->getChoices(), [1 => 'Jonathan H. Wage'], '->getChoices() returns limited choices');
diff --git a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
index c7fd14e2e..2af0d91ec 100644
--- a/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
+++ b/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
@@ -1,29 +1,38 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $app = 'frontend';
 $fixtures = 'fixtures/fixtures.yml';
 
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
 // ->getChoices()
 $t->diag('->getChoices()');
 
-$validator = new sfWidgetFormDoctrineChoice(array('model' => 'Author'));
+$validator = new \sfWidgetFormDoctrineChoice(['model' => 'Author']);
 
-$author = Doctrine_Core::getTable('Author')->createQuery()->limit(1)->fetchOne();
+$author = \Doctrine_Core::getTable('Author')->createQuery()->limit(1)->fetchOne();
 
-$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'), '->getChoices() returns choices');
+$t->is_deeply($validator->getChoices(), [1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'], '->getChoices() returns choices');
 
-$validator->setOption('order_by', array('name', 'asc'));
+$validator->setOption('order_by', ['name', 'asc']);
 
-$t->cmp_ok($validator->getChoices(), '===', array(2 => 'Fabien POTENCIER', 1 => 'Jonathan H. Wage'), '->getChoices() returns ordered choices');
+$t->cmp_ok($validator->getChoices(), '===', [2 => 'Fabien POTENCIER', 1 => 'Jonathan H. Wage'], '->getChoices() returns ordered choices');
 
 $validator->setOption('table_method', 'testTableMethod');
 
-$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'), '->getChoices() returns choices for given "table_method" option');
+$t->is_deeply($validator->getChoices(), [1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'], '->getChoices() returns choices for given "table_method" option');
 
-$validator = new sfWidgetFormDoctrineChoice(array('model' => 'Author', 'query' => Doctrine_Core::getTable('Author')->createQuery()->limit(1)));
+$validator = new \sfWidgetFormDoctrineChoice(['model' => 'Author', 'query' => \Doctrine_Core::getTable('Author')->createQuery()->limit(1)]);
 
-$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage'), '->getChoices() returns choices for given "query" option');
+$t->is_deeply($validator->getChoices(), [1 => 'Jonathan H. Wage'], '->getChoices() returns choices for given "query" option');
diff --git a/lib/request/sfRequest.class.php b/lib/request/sfRequest.class.php
index 6dffbc1ba..db4783f70 100644
--- a/lib/request/sfRequest.class.php
+++ b/lib/request/sfRequest.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfRequest implements ArrayAccess
+abstract class sfRequest implements \ArrayAccess
 {
     public const GET = 'GET';
     public const POST = 'POST';
@@ -29,20 +29,20 @@ abstract class sfRequest implements ArrayAccess
     public const HEAD = 'HEAD';
     public const OPTIONS = 'OPTIONS';
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
-    /** @var string|null */
+    /** @var \string|null */
     protected $content;
 
     /** @var string */
     protected $method;
-    protected $options = array();
+    protected $options = [];
 
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $parameterHolder;
 
-    /** @var sfParameterHolder */
+    /** @var \sfParameterHolder */
     protected $attributeHolder;
 
     /**
@@ -54,7 +54,7 @@ abstract class sfRequest implements ArrayAccess
      * @param array $attributes
      * @param array $options
      */
-    public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, $parameters = [], $attributes = [], $options = [])
     {
         $this->initialize($dispatcher, $parameters, $attributes, $options);
     }
@@ -67,13 +67,13 @@ public function __construct(sfEventDispatcher $dispatcher, $parameters = array()
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException if call fails
+     * @throws \sfException if call fails
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'request.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'request.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -92,14 +92,14 @@ public function __clone()
      *
      *  * logging: Whether to enable logging or not (false by default)
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param array             $parameters An associative array of initialization parameters
-     * @param array             $attributes An associative array of initialization attributes
-     * @param array             $options    An associative array of options
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param array              $parameters An associative array of initialization parameters
+     * @param array              $attributes An associative array of initialization attributes
+     * @param array              $options    An associative array of options
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfRequest
+     * @throws \sfInitializationException If an error occurs while initializing this sfRequest
      */
-    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $parameters = [], $attributes = [], $options = [])
     {
         $this->dispatcher = $dispatcher;
 
@@ -110,8 +110,8 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
         }
 
         // initialize parameter and attribute holders
-        $this->parameterHolder = new sfParameterHolder();
-        $this->attributeHolder = new sfParameterHolder();
+        $this->parameterHolder = new \sfParameterHolder();
+        $this->attributeHolder = new \sfParameterHolder();
 
         $this->parameterHolder->add($parameters);
         $this->attributeHolder->add($attributes);
@@ -150,7 +150,7 @@ public function getOptions()
      */
     public function extractParameters($names)
     {
-        $array = array();
+        $array = [];
 
         $parameters = $this->parameterHolder->getAll();
         foreach ($parameters as $key => $value) {
@@ -177,12 +177,12 @@ public function getMethod()
      *
      * @param string $method The request method
      *
-     * @throws sfException - If the specified request method is invalid
+     * @throws \sfException - If the specified request method is invalid
      */
     public function setMethod($method)
     {
-        if (!in_array(strtoupper($method), array(self::GET, self::POST, self::PUT, self::PATCH, self::DELETE, self::HEAD, self::OPTIONS))) {
-            throw new sfException(sprintf('Invalid request method: %s.', $method));
+        if (!in_array(strtoupper($method), [self::GET, self::POST, self::PUT, self::PATCH, self::DELETE, self::HEAD, self::OPTIONS])) {
+            throw new \sfException(sprintf('Invalid request method: %s.', $method));
         }
 
         $this->method = strtoupper($method);
@@ -240,7 +240,7 @@ public function offsetUnset($offset)
     /**
      * Retrieves the parameters for the current request.
      *
-     * @return sfParameterHolder The parameter holder
+     * @return \sfParameterHolder The parameter holder
      */
     public function getParameterHolder()
     {
@@ -250,7 +250,7 @@ public function getParameterHolder()
     /**
      * Retrieves the attributes holder.
      *
-     * @return sfParameterHolder The attribute holder
+     * @return \sfParameterHolder The attribute holder
      */
     public function getAttributeHolder()
     {
diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
index d188d6a5c..dcf2c0b7b 100644
--- a/lib/request/sfWebRequest.class.php
+++ b/lib/request/sfWebRequest.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebRequest extends sfRequest
+class sfWebRequest extends \sfRequest
 {
     public const PORT_HTTP = 80;
     public const PORT_HTTPS = 443;
@@ -32,7 +32,7 @@ class sfWebRequest extends sfRequest
     protected $getParameters;
     protected $postParameters;
     protected $requestParameters;
-    protected $formats = array();
+    protected $formats = [];
     protected $format;
     protected $fixedFileArray = false;
 
@@ -48,30 +48,30 @@ class sfWebRequest extends sfRequest
      *  * http_port:         The port to use for HTTP requests
      *  * https_port:        The port to use for HTTPS requests
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param array             $parameters An associative array of initialization parameters
-     * @param array             $attributes An associative array of initialization attributes
-     * @param array             $options    An associative array of options
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param array              $parameters An associative array of initialization parameters
+     * @param array              $attributes An associative array of initialization attributes
+     * @param array              $options    An associative array of options
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfRequest
+     * @throws \sfInitializationException If an error occurs while initializing this sfRequest
      *
-     * @see sfRequest
+     * @see \sfRequest
      */
-    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $parameters = [], $attributes = [], $options = [])
     {
-        $options = array_merge(array(
+        $options = array_merge([
             'path_info_key' => 'PATH_INFO',
             'path_info_array' => 'SERVER',
             'http_port' => null,
             'https_port' => null,
             'default_format' => null, // to maintain bc
             'trust_proxy' => true, // to maintain bc
-        ), $options);
+        ], $options);
         parent::initialize($dispatcher, $parameters, $attributes, $options);
 
         // GET parameters
         if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
-            $this->getParameters = sfToolkit::stripslashesDeep($_GET);
+            $this->getParameters = \sfToolkit::stripslashesDeep($_GET);
         } else {
             $this->getParameters = $_GET;
         }
@@ -143,7 +143,7 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
         }
 
         if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
-            $this->postParameters = sfToolkit::stripslashesDeep($postParameters);
+            $this->postParameters = \sfToolkit::stripslashesDeep($postParameters);
         } else {
             $this->postParameters = $postParameters;
         }
@@ -209,7 +209,7 @@ public function isAbsUri()
     {
         $pathArray = $this->getPathInfoArray();
 
-        return isset($pathArray['REQUEST_URI']) ? 0 === strpos($pathArray['REQUEST_URI'], 'http') : false;
+        return isset($pathArray['REQUEST_URI']) ? str_starts_with($pathArray['REQUEST_URI'], 'http') : false;
     }
 
     /**
@@ -227,7 +227,7 @@ public function getUriPrefix()
         $port = null;
 
         // extract port from host or environment variable
-        if (false !== strpos($host, ':')) {
+        if (str_contains($host, ':')) {
             list($host, $port) = explode(':', $host, 2);
         } elseif ($protocolPort = $this->getOption($protocol.'_port')) {
             $port = $protocolPort;
@@ -437,12 +437,12 @@ public function getLanguages()
         }
 
         if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            return array();
+            return [];
         }
 
         $languages = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_LANGUAGE']);
         foreach ($languages as $lang) {
-            if (false !== strpos($lang, '-')) {
+            if (str_contains($lang, '-')) {
                 $codes = explode('-', $lang);
                 if ('i' == $codes[0]) {
                     // Language not listed in ISO 639 that are not variants
@@ -480,7 +480,7 @@ public function getCharsets()
         }
 
         if (!isset($_SERVER['HTTP_ACCEPT_CHARSET'])) {
-            return array();
+            return [];
         }
 
         $this->charsets = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_CHARSET']);
@@ -500,7 +500,7 @@ public function getAcceptableContentTypes()
         }
 
         if (!isset($_SERVER['HTTP_ACCEPT'])) {
-            return array();
+            return [];
         }
 
         $this->acceptableContentTypes = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT']);
@@ -539,7 +539,7 @@ public function getHttpHeader($name, $prefix = 'http')
 
         $pathArray = $this->getPathInfoArray();
 
-        return isset($pathArray[$name]) ? sfToolkit::stripslashesDeep($pathArray[$name]) : null;
+        return isset($pathArray[$name]) ? \sfToolkit::stripslashesDeep($pathArray[$name]) : null;
     }
 
     /**
@@ -556,7 +556,7 @@ public function getCookie($name, $defaultValue = null)
 
         if (isset($_COOKIE[$name])) {
             if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
-                $retval = sfToolkit::stripslashesDeep($_COOKIE[$name]);
+                $retval = \sfToolkit::stripslashesDeep($_COOKIE[$name]);
             } else {
                 $retval = $_COOKIE[$name];
             }
@@ -615,8 +615,8 @@ public function setRelativeUrlRoot($value)
      */
     public function splitHttpAcceptHeader($header)
     {
-        $values = array();
-        $groups = array();
+        $values = [];
+        $groups = [];
         foreach (array_filter(explode(',', $header)) as $value) {
             // Cut off any q-value that might come after a semi-colon
             if ($pos = strpos($value, ';')) {
@@ -706,7 +706,7 @@ public function getFormat($mimeType)
      */
     public function setFormat($format, $mimeTypes)
     {
-        $this->formats[$format] = is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
+        $this->formats[$format] = is_array($mimeTypes) ? $mimeTypes : [$mimeTypes];
     }
 
     /**
@@ -752,7 +752,7 @@ public function getFiles($key = null)
             $this->fixedFileArray = self::convertFileInformation($_FILES);
         }
 
-        return null === $key ? $this->fixedFileArray : (isset($this->fixedFileArray[$key]) ? $this->fixedFileArray[$key] : array());
+        return null === $key ? $this->fixedFileArray : (isset($this->fixedFileArray[$key]) ? $this->fixedFileArray[$key] : []);
     }
 
     /**
@@ -766,7 +766,7 @@ public function getFiles($key = null)
      */
     public static function convertFileInformation(array $taintedFiles)
     {
-        $files = array();
+        $files = [];
         foreach ($taintedFiles as $key => $data) {
             $files[$key] = self::fixPhpFilesArray($data);
         }
@@ -788,7 +788,7 @@ public function getGetParameter($name, $default = null)
             return $this->getParameters[$name];
         }
 
-        return sfToolkit::getArrayValueForPath($this->getParameters, $name, $default);
+        return \sfToolkit::getArrayValueForPath($this->getParameters, $name, $default);
     }
 
     /**
@@ -805,7 +805,7 @@ public function getPostParameter($name, $default = null)
             return $this->postParameters[$name];
         }
 
-        return sfToolkit::getArrayValueForPath($this->postParameters, $name, $default);
+        return \sfToolkit::getArrayValueForPath($this->postParameters, $name, $default);
     }
 
     /**
@@ -822,7 +822,7 @@ public function getUrlParameter($name, $default = null)
             return $this->requestParameters[$name];
         }
 
-        return sfToolkit::getArrayValueForPath($this->requestParameters, $name, $default);
+        return \sfToolkit::getArrayValueForPath($this->requestParameters, $name, $default);
     }
 
     /**
@@ -845,8 +845,8 @@ public function getRemoteAddress()
      * This method returns null if no proxy passed this request. Note that some proxies
      * do not use this header, and act as if they were the client.
      *
-     * @return string|null an array of IP from the client and the proxies that passed
-     *                     the request, or null if no proxy was used
+     * @return \string|null an array of IP from the client and the proxies that passed
+     *                      the request, or null if no proxy was used
      */
     public function getForwardedFor()
     {
@@ -886,12 +886,12 @@ public function getClientIp($proxy = true)
     /**
      * Check CSRF protection.
      *
-     * @throws sfValidatorErrorSchema If an error occurs while validating the CRF protection for this sfRequest
+     * @throws \sfValidatorErrorSchema If an error occurs while validating the CRF protection for this sfRequest
      */
     public function checkCSRFProtection()
     {
-        $form = new BaseForm();
-        $form->bind($form->isCSRFProtected() ? array($form->getCSRFFieldName() => $this->getParameter($form->getCSRFFieldName())) : array());
+        $form = new \BaseForm();
+        $form->bind($form->isCSRFProtected() ? [$form->getCSRFFieldName() => $this->getParameter($form->getCSRFFieldName())] : []);
 
         if (!$form->isValid()) {
             throw $form->getErrorSchema();
@@ -905,7 +905,7 @@ public function checkCSRFProtection()
      */
     public function getRequestContext()
     {
-        return array(
+        return [
             'path_info' => $this->getPathInfo(),
             'prefix' => $this->getPathInfoPrefix(),
             'method' => $this->getMethod(),
@@ -913,7 +913,7 @@ public function getRequestContext()
             'host' => $this->getHost(),
             'is_secure' => $this->isSecure(),
             'request_uri' => $this->getUri(),
-        );
+        ];
     }
 
     /**
@@ -940,7 +940,7 @@ protected static function fixPhpFilesArray(array $data)
         // remove full_path added on php8.1
         unset($data['full_path']);
 
-        $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
+        $fileKeys = ['error', 'name', 'size', 'tmp_name', 'type'];
         $keys = array_keys($data);
         sort($keys);
 
@@ -953,13 +953,13 @@ protected static function fixPhpFilesArray(array $data)
             unset($files[$k]);
         }
         foreach (array_keys($data['name']) as $key) {
-            $files[$key] = self::fixPhpFilesArray(array(
+            $files[$key] = self::fixPhpFilesArray([
                 'error' => $data['error'][$key],
                 'name' => $data['name'][$key],
                 'type' => $data['type'][$key],
                 'tmp_name' => $data['tmp_name'][$key],
                 'size' => $data['size'][$key],
-            ));
+            ]);
         }
 
         return $files;
@@ -974,7 +974,7 @@ protected static function fixPhpFilesArray(array $data)
      */
     protected function parseRequestParameters()
     {
-        return $this->dispatcher->filter(new sfEvent($this, 'request.filter_parameters', $this->getRequestContext()), array())->getReturnValue();
+        return $this->dispatcher->filter(new \sfEvent($this, 'request.filter_parameters', $this->getRequestContext()), [])->getReturnValue();
     }
 
     /**
diff --git a/lib/response/sfResponse.class.php b/lib/response/sfResponse.class.php
index 776b440cd..f555ca4aa 100644
--- a/lib/response/sfResponse.class.php
+++ b/lib/response/sfResponse.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,12 +17,12 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfResponse implements Serializable
+abstract class sfResponse implements \Serializable
 {
     /** @var array */
-    protected $options = array();
+    protected $options = [];
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
     /** @var string */
@@ -34,7 +35,7 @@ abstract class sfResponse implements Serializable
      *
      * @param array $options
      */
-    public function __construct(sfEventDispatcher $dispatcher, $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->initialize($dispatcher, $options);
     }
@@ -47,13 +48,13 @@ public function __construct(sfEventDispatcher $dispatcher, $options = array())
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException If the calls fails
+     * @throws \sfException If the calls fails
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'response.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'response.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -66,7 +67,7 @@ public function __call($method, $arguments)
      */
     public function __serialize()
     {
-        return array('content' => $this->content);
+        return ['content' => $this->content];
     }
 
     /**
@@ -86,12 +87,12 @@ public function __unserialize($data)
      *
      *  * logging: Whether to enable logging or not (false by default)
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param array              $options    An array of options
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfResponse
+     * @throws \sfInitializationException If an error occurs while initializing this sfResponse
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         $this->dispatcher = $dispatcher;
         $this->options = $options;
@@ -104,9 +105,9 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
     /**
      * Sets the event dispatcher.
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
      */
-    public function setEventDispatcher(sfEventDispatcher $dispatcher)
+    public function setEventDispatcher(\sfEventDispatcher $dispatcher)
     {
         $this->dispatcher = $dispatcher;
     }
@@ -136,11 +137,11 @@ public function getContent()
      */
     public function sendContent()
     {
-        $event = $this->dispatcher->filter(new sfEvent($this, 'response.filter_content'), $this->getContent());
+        $event = $this->dispatcher->filter(new \sfEvent($this, 'response.filter_content'), $this->getContent());
         $content = $event->getReturnValue();
 
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send content (%s o)', strlen($content)))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Send content (%s o)', strlen($content))]));
         }
 
         echo $content;
diff --git a/lib/response/sfWebResponse.class.php b/lib/response/sfWebResponse.class.php
index 85cdf2305..9af8ed7f8 100644
--- a/lib/response/sfWebResponse.class.php
+++ b/lib/response/sfWebResponse.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWebResponse extends sfResponse
+class sfWebResponse extends \sfResponse
 {
     public const FIRST = 'first';
     public const MIDDLE = '';
@@ -25,19 +26,19 @@ class sfWebResponse extends sfResponse
     public const ALL = 'ALL';
     public const RAW = 'RAW';
 
-    protected $cookies = array();
+    protected $cookies = [];
     protected $statusCode = 200;
     protected $statusText = 'OK';
     protected $headerOnly = false;
-    protected $headers = array();
-    protected $metas = array();
-    protected $httpMetas = array();
-    protected $positions = array('first', '', 'last');
-    protected $stylesheets = array();
-    protected $javascripts = array();
-    protected $slots = array();
-
-    protected static $statusTexts = array(
+    protected $headers = [];
+    protected $metas = [];
+    protected $httpMetas = [];
+    protected $positions = ['first', '', 'last'];
+    protected $stylesheets = [];
+    protected $javascripts = [];
+    protected $slots = [];
+
+    protected static $statusTexts = [
         '100' => 'Continue',
         '101' => 'Switching Protocols',
         '200' => 'OK',
@@ -79,20 +80,20 @@ class sfWebResponse extends sfResponse
         '503' => 'Service Unavailable',
         '504' => 'Gateway Timeout',
         '505' => 'HTTP Version Not Supported',
-    );
+    ];
 
     /**
-     * @see sfResponse
+     * @see \sfResponse
      *
      * @return array
      */
     public function __serialize()
     {
-        return array($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots);
+        return [$this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots];
     }
 
     /**
-     * @see sfResponse
+     * @see \sfResponse
      *
      * @param array $data
      */
@@ -111,19 +112,19 @@ public function __unserialize($data)
      *  * send_http_headers: Whether to send HTTP headers or not (true by default)
      *  * http_protocol:     The HTTP protocol to use for the response (HTTP/1.0 by default)
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param array             $options    An array of options
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param array              $options    An array of options
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfResponse
+     * @throws \sfInitializationException If an error occurs while initializing this sfResponse
      *
-     * @see sfResponse
+     * @see \sfResponse
      */
-    public function initialize(sfEventDispatcher $dispatcher, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $options = [])
     {
         parent::initialize($dispatcher, $options);
 
-        $this->javascripts = array_combine($this->positions, array_fill(0, count($this->positions), array()));
-        $this->stylesheets = array_combine($this->positions, array_fill(0, count($this->positions), array()));
+        $this->javascripts = array_combine($this->positions, array_fill(0, count($this->positions), []));
+        $this->stylesheets = array_combine($this->positions, array_fill(0, count($this->positions), []));
 
         if (!isset($this->options['charset'])) {
             $this->options['charset'] = 'utf-8';
@@ -171,7 +172,7 @@ public function isHeaderOnly()
      * @param bool   $secure   If secure
      * @param bool   $httpOnly If uses only HTTP
      *
-     * @throws sfException If fails to set the cookie
+     * @throws \sfException If fails to set the cookie
      */
     public function setCookie($name, $value, $expire = null, $path = '/', $domain = '', $secure = false, $httpOnly = false)
     {
@@ -181,12 +182,12 @@ public function setCookie($name, $value, $expire = null, $path = '/', $domain =
             } else {
                 $expire = strtotime($expire);
                 if (false === $expire || -1 == $expire) {
-                    throw new sfException('Your expire parameter is not valid.');
+                    throw new \sfException('Your expire parameter is not valid.');
                 }
             }
         }
 
-        $this->cookies[$name] = array(
+        $this->cookies[$name] = [
             'name' => $name,
             'value' => $value,
             'expire' => $expire,
@@ -194,7 +195,7 @@ public function setCookie($name, $value, $expire = null, $path = '/', $domain =
             'domain' => $domain,
             'secure' => $secure ? true : false,
             'httpOnly' => $httpOnly,
-        );
+        ];
     }
 
     /**
@@ -341,7 +342,7 @@ public function sendHttpHeaders()
         }
 
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send status "%s"', $status))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Send status "%s"', $status)]));
         }
 
         // headers
@@ -352,7 +353,7 @@ public function sendHttpHeaders()
             header($name.': '.$value);
 
             if ('' != $value && $this->options['logging']) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send header "%s: %s"', $name, $value))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Send header "%s: %s"', $name, $value)]));
             }
         }
 
@@ -363,7 +364,7 @@ public function sendHttpHeaders()
             setrawcookie($cookie['name'], $cookie['value'], $expire, $cookie['path'], $domain, $cookie['secure'], $cookie['httpOnly']);
 
             if ($this->options['logging']) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send cookie "%s": "%s"', $cookie['name'], $cookie['value']))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Send cookie "%s": "%s"', $cookie['name'], $cookie['value'])]));
             }
         }
         // prevent resending the headers
@@ -389,7 +390,7 @@ public function send()
         $this->sendContent();
 
         if (function_exists('fastcgi_finish_request')) {
-            $this->dispatcher->notify(new sfEvent($this, 'response.fastcgi_finish_request'));
+            $this->dispatcher->notify(new \sfEvent($this, 'response.fastcgi_finish_request'));
             fastcgi_finish_request();
         }
     }
@@ -416,7 +417,7 @@ public static function getDate($timestamp, $type = 'rfc1123')
             return gmdate('D M j H:i:s', $timestamp);
         }
 
-        throw new InvalidArgumentException('The second getDate() method parameter must be one of: rfc1123, rfc1036 or asctime.');
+        throw new \InvalidArgumentException('The second getDate() method parameter must be one of: rfc1123, rfc1036 or asctime.');
     }
 
     /**
@@ -427,7 +428,7 @@ public static function getDate($timestamp, $type = 'rfc1123')
     public function addVaryHttpHeader($header)
     {
         $vary = $this->getHttpHeader('Vary');
-        $currentHeaders = array();
+        $currentHeaders = [];
         if ($vary) {
             $currentHeaders = preg_split('/\s*,\s*/', $vary);
         }
@@ -448,7 +449,7 @@ public function addVaryHttpHeader($header)
     public function addCacheControlHttpHeader($name, $value = null)
     {
         $cacheControl = $this->getHttpHeader('Cache-Control');
-        $currentHeaders = array();
+        $currentHeaders = [];
         if ($cacheControl) {
             foreach (preg_split('/\s*,\s*/', $cacheControl) as $tmp) {
                 $tmp = explode('=', $tmp);
@@ -457,7 +458,7 @@ public function addCacheControlHttpHeader($name, $value = null)
         }
         $currentHeaders[str_replace('_', '-', strtolower($name))] = $value;
 
-        $headers = array();
+        $headers = [];
         foreach ($currentHeaders as $key => $value) {
             $headers[] = $key.(null !== $value ? '='.$value : '');
         }
@@ -613,7 +614,7 @@ public function getPositions()
     public function getStylesheets($position = self::ALL)
     {
         if (self::ALL === $position) {
-            $stylesheets = array();
+            $stylesheets = [];
             foreach ($this->getPositions() as $position) {
                 foreach ($this->stylesheets[$position] as $file => $options) {
                     $stylesheets[$file] = $options;
@@ -638,7 +639,7 @@ public function getStylesheets($position = self::ALL)
      * @param string $position Position
      * @param array  $options  Stylesheet options
      */
-    public function addStylesheet($file, $position = '', $options = array())
+    public function addStylesheet($file, $position = '', $options = [])
     {
         $this->validatePosition($position);
 
@@ -680,7 +681,7 @@ public function clearStylesheets()
     public function getJavascripts($position = self::ALL)
     {
         if (self::ALL === $position) {
-            $javascripts = array();
+            $javascripts = [];
             foreach ($this->getPositions() as $position) {
                 foreach ($this->javascripts[$position] as $file => $options) {
                     $javascripts[$file] = $options;
@@ -705,7 +706,7 @@ public function getJavascripts($position = self::ALL)
      * @param string $position Position
      * @param array  $options  Javascript options
      */
-    public function addJavascript($file, $position = '', $options = array())
+    public function addJavascript($file, $position = '', $options = [])
     {
         $this->validatePosition($position);
 
@@ -780,15 +781,15 @@ public function getHttpHeaders()
      */
     public function clearHttpHeaders()
     {
-        $this->headers = array();
+        $this->headers = [];
     }
 
     /**
      * Copies all properties from a given sfWebResponse object to the current one.
      *
-     * @param sfWebResponse $response An sfWebResponse instance
+     * @param \sfWebResponse $response An sfWebResponse instance
      */
-    public function copyProperties(sfWebResponse $response)
+    public function copyProperties(\sfWebResponse $response)
     {
         $this->options = $response->getOptions();
         $this->headers = $response->getHttpHeaders();
@@ -806,9 +807,9 @@ public function copyProperties(sfWebResponse $response)
     /**
      * Merges all properties from a given sfWebResponse object to the current one.
      *
-     * @param sfWebResponse $response An sfWebResponse instance
+     * @param \sfWebResponse $response An sfWebResponse instance
      */
-    public function merge(sfWebResponse $response)
+    public function merge(\sfWebResponse $response)
     {
         foreach ($this->getPositions() as $position) {
             $this->javascripts[$position] = array_merge($this->getJavascripts($position), $response->getJavascripts($position));
@@ -819,7 +820,7 @@ public function merge(sfWebResponse $response)
     }
 
     /**
-     * @see sfResponse
+     * @see \sfResponse
      */
     public function serialize()
     {
@@ -827,7 +828,7 @@ public function serialize()
     }
 
     /**
-     * @see sfResponse
+     * @see \sfResponse
      */
     public function unserialize($serialized)
     {
@@ -843,7 +844,7 @@ public function unserialize($serialized)
      */
     protected function normalizeHeaderName($name)
     {
-        return strtr(ucwords(strtr(strtolower($name), array('_' => ' ', '-' => ' '))), array(' ' => '-'));
+        return strtr(ucwords(strtr(strtolower($name), ['_' => ' ', '-' => ' '])), [' ' => '-']);
     }
 
     /**
@@ -851,12 +852,12 @@ protected function normalizeHeaderName($name)
      *
      * @param string $position
      *
-     * @throws InvalidArgumentException if the position is not available
+     * @throws \InvalidArgumentException if the position is not available
      */
     protected function validatePosition($position)
     {
         if (!in_array($position, $this->positions, true)) {
-            throw new InvalidArgumentException(sprintf('The position "%s" does not exist (available positions: %s).', $position, implode(', ', $this->positions)));
+            throw new \InvalidArgumentException(sprintf('The position "%s" does not exist (available positions: %s).', $position, implode(', ', $this->positions)));
         }
     }
 
diff --git a/lib/routing/sfObjectRoute.class.php b/lib/routing/sfObjectRoute.class.php
index 215f6353f..1383fe3ce 100644
--- a/lib/routing/sfObjectRoute.class.php
+++ b/lib/routing/sfObjectRoute.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfObjectRoute extends sfRequestRoute
+class sfObjectRoute extends \sfRequestRoute
 {
     /** @var bool|object */
     protected $object = false;
@@ -33,20 +34,20 @@ class sfObjectRoute extends sfRequestRoute
      * @param array  $requirements An array of requirements for parameters (regexes)
      * @param array  $options      An array of options
      *
-     * @see sfRoute
+     * @see \sfRoute
      */
-    public function __construct($pattern, array $defaults = array(), array $requirements = array(), array $options = array())
+    public function __construct($pattern, array $defaults = [], array $requirements = [], array $options = [])
     {
         if (!isset($options['model'])) {
-            throw new InvalidArgumentException(sprintf('You must pass a "model" option for a %s object (%s).', get_class($this), $pattern));
+            throw new \InvalidArgumentException(sprintf('You must pass a "model" option for a %s object (%s).', get_class($this), $pattern));
         }
 
         if (!isset($options['type'])) {
-            throw new InvalidArgumentException(sprintf('You must pass a "type" option for a %s object (%s).', get_class($this), $pattern));
+            throw new \InvalidArgumentException(sprintf('You must pass a "type" option for a %s object (%s).', get_class($this), $pattern));
         }
 
-        if (!in_array($options['type'], array('object', 'list'))) {
-            throw new InvalidArgumentException(sprintf('The "type" option can only be "object" or "list", "%s" given (%s).', $options['type'], $pattern));
+        if (!in_array($options['type'], ['object', 'list'])) {
+            throw new \InvalidArgumentException(sprintf('The "type" option can only be "object" or "list", "%s" given (%s).', $options['type'], $pattern));
         }
 
         parent::__construct($pattern, $defaults, $requirements, $options);
@@ -60,7 +61,7 @@ public function __construct($pattern, array $defaults = array(), array $requirem
      *
      * @return bool true if the parameters matches this route, false otherwise
      */
-    public function matchesParameters($params, $context = array())
+    public function matchesParameters($params, $context = [])
     {
         return parent::matchesParameters('object' == $this->options['type'] ? $this->convertObjectToArray($params) : $params);
     }
@@ -74,7 +75,7 @@ public function matchesParameters($params, $context = array())
      *
      * @return string The generated URL
      */
-    public function generate($params, $context = array(), $absolute = false)
+    public function generate($params, $context = [], $absolute = false)
     {
         return parent::generate('object' == $this->options['type'] ? $this->convertObjectToArray($params) : $params, $context, $absolute);
     }
@@ -86,16 +87,16 @@ public function generate($params, $context = array(), $absolute = false)
      *
      * @return object The related object
      *
-     * @throws sfError404Exception
+     * @throws \sfError404Exception
      */
     public function getObject()
     {
         if (!$this->isBound()) {
-            throw new LogicException('The route is not bound.');
+            throw new \LogicException('The route is not bound.');
         }
 
         if ('object' != $this->options['type']) {
-            throw new LogicException(sprintf('The route "%s" is not of type "object".', $this->pattern));
+            throw new \LogicException(sprintf('The route "%s" is not of type "object".', $this->pattern));
         }
 
         if (false !== $this->object) {
@@ -104,7 +105,7 @@ public function getObject()
 
         // check the related object
         if (!($this->object = $this->getObjectForParameters($this->parameters)) && (!isset($this->options['allow_empty']) || !$this->options['allow_empty'])) {
-            throw new sfError404Exception(sprintf('Unable to find the %s object with the following parameters "%s").', $this->options['model'], str_replace("\n", '', var_export($this->filterParameters($this->parameters), true))));
+            throw new \sfError404Exception(sprintf('Unable to find the %s object with the following parameters "%s").', $this->options['model'], str_replace("\n", '', var_export($this->filterParameters($this->parameters), true))));
         }
 
         return $this->object;
@@ -117,16 +118,16 @@ public function getObject()
      *
      * @return array And array of related objects
      *
-     * @throws sfError404Exception
+     * @throws \sfError404Exception
      */
     public function getObjects()
     {
         if (!$this->isBound()) {
-            throw new LogicException('The route is not bound.');
+            throw new \LogicException('The route is not bound.');
         }
 
         if ('list' != $this->options['type']) {
-            throw new LogicException(sprintf('The route "%s" is not of type "list".', $this->pattern));
+            throw new \LogicException(sprintf('The route "%s" is not of type "list".', $this->pattern));
         }
 
         if (false !== $this->objects) {
@@ -136,7 +137,7 @@ public function getObjects()
         $this->objects = $this->getObjectsForParameters($this->parameters);
 
         if (!count($this->objects) && isset($this->options['allow_empty']) && !$this->options['allow_empty']) {
-            throw new sfError404Exception(sprintf('No %s object found for the following parameters "%s").', $this->options['model'], str_replace("\n", '', var_export($this->filterParameters($this->parameters), true))));
+            throw new \sfError404Exception(sprintf('No %s object found for the following parameters "%s").', $this->options['model'], str_replace("\n", '', var_export($this->filterParameters($this->parameters), true))));
         }
 
         return $this->objects;
@@ -147,10 +148,10 @@ protected function getObjectForParameters($parameters)
         $className = $this->options['model'];
 
         if (!isset($this->options['method'])) {
-            throw new InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
+            throw new \InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
         }
 
-        return call_user_func(array($className, $this->options['method']), $this->filterParameters($parameters));
+        return call_user_func([$className, $this->options['method']], $this->filterParameters($parameters));
     }
 
     protected function getObjectsForParameters($parameters)
@@ -158,10 +159,10 @@ protected function getObjectsForParameters($parameters)
         $className = $this->options['model'];
 
         if (!isset($this->options['method'])) {
-            throw new InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
+            throw new \InvalidArgumentException(sprintf('You must pass a "method" option for a %s object.', get_class($this)));
         }
 
-        return call_user_func(array($className, $this->options['method']), $this->filterParameters($parameters));
+        return call_user_func([$className, $this->options['method']], $this->filterParameters($parameters));
     }
 
     protected function filterParameters($parameters)
@@ -170,7 +171,7 @@ protected function filterParameters($parameters)
             return $parameters;
         }
 
-        $params = array();
+        $params = [];
         foreach (array_keys($this->variables) as $variable) {
             $params[$variable] = $parameters[$variable];
         }
@@ -193,7 +194,7 @@ protected function convertObjectToArray($object)
             $object = $parameters['sf_subject'];
             unset($parameters['sf_subject']);
         } else {
-            $parameters = array();
+            $parameters = [];
         }
 
         return array_merge($parameters, $this->doConvertObjectToArray($object));
@@ -208,10 +209,10 @@ protected function doConvertObjectToArray($object)
 
     protected function getRealVariables()
     {
-        $variables = array();
+        $variables = [];
 
         foreach (array_keys($this->variables) as $variable) {
-            if (0 === strpos($variable, 'sf_') || in_array($variable, array('module', 'action'))) {
+            if (str_starts_with($variable, 'sf_') || in_array($variable, ['module', 'action'])) {
                 continue;
             }
 
diff --git a/lib/routing/sfObjectRouteCollection.class.php b/lib/routing/sfObjectRouteCollection.class.php
index 2d54744d9..0947272e9 100644
--- a/lib/routing/sfObjectRouteCollection.class.php
+++ b/lib/routing/sfObjectRouteCollection.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfObjectRouteCollection extends sfRouteCollection
+class sfObjectRouteCollection extends \sfRouteCollection
 {
     protected $routeClass = 'sfObjectRoute';
 
@@ -29,24 +30,24 @@ public function __construct(array $options)
         parent::__construct($options);
 
         if (!isset($this->options['model'])) {
-            throw new InvalidArgumentException(sprintf('You must pass a "model" option to %s ("%s" route)', get_class($this), $this->options['name']));
+            throw new \InvalidArgumentException(sprintf('You must pass a "model" option to %s ("%s" route)', get_class($this), $this->options['name']));
         }
 
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'actions' => false,
             'module' => $this->options['name'],
             'prefix_path' => '/'.$this->options['name'],
             'column' => isset($this->options['column']) ? $this->options['column'] : 'id',
             'with_show' => true,
-            'segment_names' => array('edit' => 'edit', 'new' => 'new'),
-            'model_methods' => array(),
-            'requirements' => array(),
+            'segment_names' => ['edit' => 'edit', 'new' => 'new'],
+            'model_methods' => [],
+            'requirements' => [],
             'with_wildcard_routes' => false,
-            'default_params' => array(),
-        ), $this->options);
+            'default_params' => [],
+        ], $this->options);
 
-        $this->options['requirements'] = array_merge(array($this->options['column'] => 'id' == $this->options['column'] ? '\d+' : null), $this->options['requirements']);
-        $this->options['model_methods'] = array_merge(array('list' => null, 'object' => null), $this->options['model_methods']);
+        $this->options['requirements'] = array_merge([$this->options['column'] => 'id' == $this->options['column'] ? '\d+' : null], $this->options['requirements']);
+        $this->options['model_methods'] = array_merge(['list' => null, 'object' => null], $this->options['model_methods']);
 
         if (isset($this->options['route_class'])) {
             $this->routeClass = $this->options['route_class'];
@@ -69,7 +70,7 @@ protected function generateRoutes()
         foreach ($actions as $action) {
             $method = 'getRouteFor'.ucfirst($action);
             if (!method_exists($this, $method)) {
-                throw new InvalidArgumentException(sprintf('Unable to generate a route for the "%s" action.', $action));
+                throw new \InvalidArgumentException(sprintf('Unable to generate a route for the "%s" action.', $action));
             }
 
             $this->routes[$this->getRoute($action)] = $this->{$method}();
@@ -86,17 +87,17 @@ protected function generateRoutes()
             // wildcard object actions
             $this->routes[$this->getRoute('object')] = new $this->routeClass(
                 sprintf('%s/:%s/:action.:sf_format', $this->options['prefix_path'], $this->options['column']),
-                array_merge(array('module' => $this->options['module'], 'sf_format' => 'html'), $this->options['default_params']),
-                array_merge($this->options['requirements'], array('sf_method' => array('get', 'head'))),
-                array('model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object'])
+                array_merge(['module' => $this->options['module'], 'sf_format' => 'html'], $this->options['default_params']),
+                array_merge($this->options['requirements'], ['sf_method' => ['get', 'head']]),
+                ['model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object']]
             );
 
             // wildcard collection actions
             $this->routes[$this->getRoute('collection')] = new $this->routeClass(
                 sprintf('%s/:action/action.:sf_format', $this->options['prefix_path']),
-                array_merge(array('module' => $this->options['module'], 'sf_format' => 'html'), $this->options['default_params']),
-                array_merge($this->options['requirements'], array('sf_method' => 'post')),
-                array('model' => $this->options['model'], 'type' => 'list', 'method' => $this->options['model_methods']['list'])
+                array_merge(['module' => $this->options['module'], 'sf_format' => 'html'], $this->options['default_params']),
+                array_merge($this->options['requirements'], ['sf_method' => 'post']),
+                ['model' => $this->options['model'], 'type' => 'list', 'method' => $this->options['model_methods']['list']]
             );
         }
     }
@@ -105,9 +106,9 @@ protected function getRouteForCollection($action, $methods)
     {
         return new $this->routeClass(
             sprintf('%s/%s.:sf_format', $this->options['prefix_path'], $action),
-            array_merge(array('module' => $this->options['module'], 'action' => $action, 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => $methods)),
-            array('model' => $this->options['model'], 'type' => 'list', 'method' => $this->options['model_methods']['list'])
+            array_merge(['module' => $this->options['module'], 'action' => $action, 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => $methods]),
+            ['model' => $this->options['model'], 'type' => 'list', 'method' => $this->options['model_methods']['list']]
         );
     }
 
@@ -115,9 +116,9 @@ protected function getRouteForObject($action, $methods)
     {
         return new $this->routeClass(
             sprintf('%s/:%s/%s.:sf_format', $this->options['prefix_path'], $this->options['column'], $action),
-            array_merge(array('module' => $this->options['module'], 'action' => $action, 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => $methods)),
-            array('model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object'])
+            array_merge(['module' => $this->options['module'], 'action' => $action, 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => $methods]),
+            ['model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object']]
         );
     }
 
@@ -125,9 +126,9 @@ protected function getRouteForList()
     {
         return new $this->routeClass(
             sprintf('%s.:sf_format', $this->options['prefix_path']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('list'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => array('get', 'head'))),
-            array('model' => $this->options['model'], 'type' => 'list', 'method' => $this->options['model_methods']['list'])
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('list'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => ['get', 'head']]),
+            ['model' => $this->options['model'], 'type' => 'list', 'method' => $this->options['model_methods']['list']]
         );
     }
 
@@ -135,9 +136,9 @@ protected function getRouteForNew()
     {
         return new $this->routeClass(
             sprintf('%s/%s.:sf_format', $this->options['prefix_path'], $this->options['segment_names']['new']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('new'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => array('get', 'head'))),
-            array('model' => $this->options['model'], 'type' => 'object')
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('new'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => ['get', 'head']]),
+            ['model' => $this->options['model'], 'type' => 'object']
         );
     }
 
@@ -145,9 +146,9 @@ protected function getRouteForCreate()
     {
         return new $this->routeClass(
             sprintf('%s.:sf_format', $this->options['prefix_path']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('create'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => 'post')),
-            array('model' => $this->options['model'], 'type' => 'object')
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('create'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => 'post']),
+            ['model' => $this->options['model'], 'type' => 'object']
         );
     }
 
@@ -155,9 +156,9 @@ protected function getRouteForShow()
     {
         return new $this->routeClass(
             sprintf('%s/:%s.:sf_format', $this->options['prefix_path'], $this->options['column']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('show'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => array('get', 'head'))),
-            array('model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object'])
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('show'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => ['get', 'head']]),
+            ['model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object']]
         );
     }
 
@@ -165,9 +166,9 @@ protected function getRouteForEdit()
     {
         return new $this->routeClass(
             sprintf('%s/:%s/%s.:sf_format', $this->options['prefix_path'], $this->options['column'], $this->options['segment_names']['edit']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('edit'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => array('get', 'head'))),
-            array('model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object'])
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('edit'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => ['get', 'head']]),
+            ['model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object']]
         );
     }
 
@@ -175,9 +176,9 @@ protected function getRouteForUpdate()
     {
         return new $this->routeClass(
             sprintf('%s/:%s.:sf_format', $this->options['prefix_path'], $this->options['column']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('update'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => 'put')),
-            array('model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object'])
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('update'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => 'put']),
+            ['model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object']]
         );
     }
 
@@ -185,15 +186,15 @@ protected function getRouteForDelete()
     {
         return new $this->routeClass(
             sprintf('%s/:%s.:sf_format', $this->options['prefix_path'], $this->options['column']),
-            array_merge(array('module' => $this->options['module'], 'action' => $this->getActionMethod('delete'), 'sf_format' => 'html'), $this->options['default_params']),
-            array_merge($this->options['requirements'], array('sf_method' => 'delete')),
-            array('model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object'])
+            array_merge(['module' => $this->options['module'], 'action' => $this->getActionMethod('delete'), 'sf_format' => 'html'], $this->options['default_params']),
+            array_merge($this->options['requirements'], ['sf_method' => 'delete']),
+            ['model' => $this->options['model'], 'type' => 'object', 'method' => $this->options['model_methods']['object']]
         );
     }
 
     protected function getDefaultActions()
     {
-        $actions = array('list', 'new', 'create', 'edit', 'update', 'delete');
+        $actions = ['list', 'new', 'create', 'edit', 'update', 'delete'];
 
         if ($this->options['with_show']) {
             $actions[] = 'show';
diff --git a/lib/routing/sfPatternRouting.class.php b/lib/routing/sfPatternRouting.class.php
index 7b5b145bc..21842b50b 100644
--- a/lib/routing/sfPatternRouting.class.php
+++ b/lib/routing/sfPatternRouting.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,15 +18,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfPatternRouting extends sfRouting
+class sfPatternRouting extends \sfRouting
 {
-    /** @var string|null */
+    /** @var \string|null */
     protected $currentRouteName;
-    protected $currentInternalUri = array();
+    protected $currentInternalUri = [];
 
     /** @var sfRoute[] */
-    protected $routes = array();
-    protected $cacheData = array();
+    protected $routes = [];
+    protected $cacheData = [];
     protected $cacheChanged = false;
 
     /**
@@ -43,20 +44,20 @@ class sfPatternRouting extends sfRouting
      *                                      WARNING: When this option is activated, do not use sfFileCache; use a fast access
      *                                      cache backend (like sfAPCCache).
      *
-     * @see sfRouting
+     * @see \sfRouting
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, \sfCache $cache = null, $options = [])
     {
-        $options = array_merge(array(
-            'variable_prefixes' => array(':'),
-            'segment_separators' => array('/', '.'),
+        $options = array_merge([
+            'variable_prefixes' => [':'],
+            'segment_separators' => ['/', '.'],
             'variable_regex' => '[\w\d_]+',
             'load_configuration' => false,
             'suffix' => '',
             'generate_shortest_url' => true,
             'extra_parameters_as_query_string' => true,
             'lookup_cache_dedicated_keys' => false,
-        ), $options);
+        ], $options);
 
         // for BC
         if ('.' == $options['suffix']) {
@@ -71,7 +72,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null,
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function loadConfiguration()
     {
@@ -83,7 +84,7 @@ public function loadConfiguration()
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function setDefaultParameter($key, $value)
     {
@@ -97,7 +98,7 @@ public function setDefaultParameter($key, $value)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function setDefaultParameters($parameters)
     {
@@ -111,7 +112,7 @@ public function setDefaultParameters($parameters)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function getCurrentInternalUri($withRouteName = false)
     {
@@ -129,7 +130,7 @@ public function getCurrentRouteName()
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function getRoutes()
     {
@@ -137,12 +138,12 @@ public function getRoutes()
     }
 
     /**
-     * @see  sfRouting
+     * @see  \sfRouting
      */
     public function getRoute($name)
     {
         if (!array_key_exists($name, $this->routes)) {
-            throw new sfException(sprintf('Route "%s" is not defined.', $name));
+            throw new \sfException(sprintf('Route "%s" is not defined.', $name));
         }
 
         $route = $this->routes[$name];
@@ -156,7 +157,7 @@ public function getRoute($name)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function setRoutes($routes)
     {
@@ -166,7 +167,7 @@ public function setRoutes($routes)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function hasRoutes()
     {
@@ -174,15 +175,15 @@ public function hasRoutes()
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function clearRoutes()
     {
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Clear all current routes')));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Clear all current routes']));
         }
 
-        $this->routes = array();
+        $this->routes = [];
     }
 
     /**
@@ -200,15 +201,15 @@ public function hasRouteName($name)
     /**
      * Adds a new route at the beginning of the current list of routes.
      *
-     * @see connect
+     * @see \connect
      *
-     * @param string  $name
-     * @param sfRoute $route
+     * @param string   $name
+     * @param \sfRoute $route
      */
     public function prependRoute($name, $route)
     {
         $routes = $this->routes;
-        $this->routes = array();
+        $this->routes = [];
         $this->connect($name, $route);
         $this->routes = array_merge($this->routes, $routes);
     }
@@ -218,10 +219,10 @@ public function prependRoute($name, $route)
      *
      * Alias for the connect method.
      *
-     * @see connect
+     * @see \connect
      *
-     * @param string  $name
-     * @param sfRoute $route
+     * @param string   $name
+     * @param \sfRoute $route
      *
      * @return array
      */
@@ -233,23 +234,23 @@ public function appendRoute($name, $route)
     /**
      * Adds a new route before a given one in the current list of routes.
      *
-     * @see connect
+     * @see \connect
      *
-     * @param string  $pivot
-     * @param string  $name
-     * @param sfRoute $route
+     * @param string   $pivot
+     * @param string   $name
+     * @param \sfRoute $route
      *
-     * @throws sfConfigurationException
+     * @throws \sfConfigurationException
      */
     public function insertRouteBefore($pivot, $name, $route)
     {
         if (!isset($this->routes[$pivot])) {
-            throw new sfConfigurationException(sprintf('Unable to insert route "%s" before inexistent route "%s".', $name, $pivot));
+            throw new \sfConfigurationException(sprintf('Unable to insert route "%s" before inexistent route "%s".', $name, $pivot));
         }
 
         $routes = $this->routes;
-        $this->routes = array();
-        $newroutes = array();
+        $this->routes = [];
+        $newroutes = [];
         foreach ($routes as $key => $value) {
             if ($key == $pivot) {
                 $this->connect($name, $route);
@@ -274,34 +275,34 @@ public function insertRouteBefore($pivot, $name, $route)
      * $r->connect('default', new sfRoute('/:module/:action/*'));
      * </code>
      *
-     * @param string  $name  The route name
-     * @param sfRoute $route A sfRoute instance
+     * @param string   $name  The route name
+     * @param \sfRoute $route A sfRoute instance
      *
      * @return array current routes
      */
     public function connect($name, $route)
     {
-        $routes = $route instanceof sfRouteCollection ? $route : array($name => $route);
+        $routes = $route instanceof \sfRouteCollection ? $route : [$name => $route];
         foreach (self::flattenRoutes($routes) as $name => $route) {
             $this->routes[$name] = $route;
             $this->configureRoute($route);
 
             if ($this->options['logging']) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Connect %s "%s" (%s)', get_class($route), $name, $route->getPattern()))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Connect %s "%s" (%s)', get_class($route), $name, $route->getPattern())]));
             }
         }
     }
 
-    public function configureRoute(sfRoute $route)
+    public function configureRoute(\sfRoute $route)
     {
         $route->setDefaultParameters($this->defaultParameters);
         $route->setDefaultOptions($this->options);
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
-    public function generate($name, $params = array(), $absolute = false)
+    public function generate($name, $params = [], $absolute = false)
     {
         // fetch from cache
         if (null !== $this->cache) {
@@ -319,7 +320,7 @@ public function generate($name, $params = array(), $absolute = false)
         } else {
             // find a matching route
             if (false === $route = $this->getRouteThatMatchesParameters($params)) {
-                throw new sfConfigurationException(sprintf('Unable to find a matching route to generate url for params "%s".', is_object($params) ? 'Object('.get_class($params).')' : str_replace("\n", '', var_export($params, true))));
+                throw new \sfConfigurationException(sprintf('Unable to find a matching route to generate url for params "%s".', is_object($params) ? 'Object('.get_class($params).')' : str_replace("\n", '', var_export($params, true))));
             }
         }
 
@@ -339,19 +340,19 @@ public function generate($name, $params = array(), $absolute = false)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function parse($url)
     {
         if (false === $info = $this->findRoute($url)) {
             $this->currentRouteName = null;
-            $this->currentInternalUri = array();
+            $this->currentInternalUri = [];
 
             return false;
         }
 
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Match route "%s" (%s) for %s with parameters %s', $info['name'], $info['pattern'], $url, str_replace("\n", '', var_export($info['parameters'], true))))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Match route "%s" (%s) for %s with parameters %s', $info['name'], $info['pattern'], $url, str_replace("\n", '', var_export($info['parameters'], true)))]));
         }
 
         // store the current internal URI
@@ -412,9 +413,9 @@ public function findRoute($url)
 
     public static function flattenRoutes($routes)
     {
-        $flattenRoutes = array();
+        $flattenRoutes = [];
         foreach ($routes as $name => $route) {
-            if ($route instanceof sfRouteCollection) {
+            if ($route instanceof \sfRouteCollection) {
                 $flattenRoutes = array_merge($flattenRoutes, self::flattenRoutes($route));
             } else {
                 $flattenRoutes[$name] = $route;
@@ -425,7 +426,7 @@ public static function flattenRoutes($routes)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function shutdown()
     {
@@ -437,7 +438,7 @@ public function shutdown()
 
     protected function getConfigFileName()
     {
-        return sfContext::getInstance()->getConfigCache()->checkConfig('config/routing.yml', true);
+        return \sfContext::getInstance()->getConfigCache()->checkConfig('config/routing.yml', true);
     }
 
     protected function getGenerateCacheKey($name, $params)
@@ -450,10 +451,10 @@ protected function updateCurrentInternalUri($name, array $parameters)
         // store the route name
         $this->currentRouteName = $name;
 
-        $internalUri = array('@'.$this->currentRouteName, $parameters['module'].'/'.$parameters['action']);
+        $internalUri = ['@'.$this->currentRouteName, $parameters['module'].'/'.$parameters['action']];
         unset($parameters['module'], $parameters['action']);
 
-        $params = array();
+        $params = [];
         foreach ($parameters as $key => $value) {
             $params[] = $key.'='.$value;
         }
@@ -463,7 +464,7 @@ protected function updateCurrentInternalUri($name, array $parameters)
 
         $params = $params ? '?'.implode('&', $params) : '';
 
-        $this->currentInternalUri = array($internalUri[0].$params, $internalUri[1].$params);
+        $this->currentInternalUri = [$internalUri[0].$params, $internalUri[1].$params];
     }
 
     protected function getParseCacheKey($url)
@@ -480,7 +481,7 @@ protected function getRouteThatMatchesUrl($url)
                 continue;
             }
 
-            return array('name' => $name, 'pattern' => $route->getPattern(), 'parameters' => $parameters);
+            return ['name' => $name, 'pattern' => $route->getPattern(), 'parameters' => $parameters];
         }
 
         return false;
diff --git a/lib/routing/sfRequestRoute.class.php b/lib/routing/sfRequestRoute.class.php
index 8933bbf96..b20eb1187 100644
--- a/lib/routing/sfRequestRoute.class.php
+++ b/lib/routing/sfRequestRoute.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,19 +18,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfRequestRoute extends sfRoute
+class sfRequestRoute extends \sfRoute
 {
     /**
      * Constructor.
      *
      * Applies a default sf_method requirements of GET or HEAD.
      *
-     * @see sfRoute
+     * @see \sfRoute
      */
-    public function __construct($pattern, $defaults = array(), $requirements = array(), $options = array())
+    public function __construct($pattern, $defaults = [], $requirements = [], $options = [])
     {
         if (!isset($requirements['sf_method'])) {
-            $requirements['sf_method'] = array('get', 'head');
+            $requirements['sf_method'] = ['get', 'head'];
         } else {
             $requirements['sf_method'] = array_map('strtolower', (array) $requirements['sf_method']);
         }
@@ -45,7 +46,7 @@ public function __construct($pattern, $defaults = array(), $requirements = array
      *
      * @return array|bool An array of parameters or false if not matching
      */
-    public function matchesUrl($url, $context = array())
+    public function matchesUrl($url, $context = [])
     {
         if (false === $parameters = parent::matchesUrl($url, $context)) {
             return false;
@@ -67,7 +68,7 @@ public function matchesUrl($url, $context = array())
      *
      * @return bool true if the parameters match this route, false otherwise
      */
-    public function matchesParameters($params, $context = array())
+    public function matchesParameters($params, $context = [])
     {
         if (isset($params['sf_method'])) {
             // enforce the sf_method requirement
@@ -90,7 +91,7 @@ public function matchesParameters($params, $context = array())
      *
      * @return string The generated URL
      */
-    public function generate($params, $context = array(), $absolute = false)
+    public function generate($params, $context = [], $absolute = false)
     {
         unset($params['sf_method']);
 
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
index fa1942773..0aabfb1ac 100644
--- a/lib/routing/sfRoute.class.php
+++ b/lib/routing/sfRoute.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,26 +16,26 @@
  *
  * @version    SVN: $Id$
  */
-class sfRoute implements Serializable
+class sfRoute implements \Serializable
 {
     protected $isBound = false;
     protected $context;
     protected $parameters;
     protected $suffix;
-    protected $defaultParameters = array();
-    protected $defaultOptions = array();
+    protected $defaultParameters = [];
+    protected $defaultOptions = [];
     protected $compiled = false;
-    protected $options = array();
+    protected $options = [];
     protected $pattern;
     protected $staticPrefix;
     protected $regex;
-    protected $variables = array();
-    protected $defaults = array();
-    protected $requirements = array();
-    protected $tokens = array();
+    protected $variables = [];
+    protected $defaults = [];
+    protected $requirements = [];
+    protected $tokens = [];
     protected $customToken = false;
     protected $firstOptional;
-    protected $segments = array();
+    protected $segments = [];
 
     /**
      * Constructor.
@@ -52,7 +53,7 @@ class sfRoute implements Serializable
      * @param array  $requirements An array of requirements for parameters (regexes)
      * @param array  $options      An array of options
      */
-    public function __construct($pattern, array $defaults = array(), array $requirements = array(), array $options = array())
+    public function __construct($pattern, array $defaults = [], array $requirements = [], array $options = [])
     {
         $this->pattern = trim($pattern);
         $this->defaults = $defaults;
@@ -71,7 +72,7 @@ public function __serialize()
         $this->compile();
 
         // sfPatternRouting will always re-set defaultParameters, so no need to serialize them
-        return array($this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken);
+        return [$this->tokens, $this->defaultOptions, $this->options, $this->pattern, $this->staticPrefix, $this->regex, $this->variables, $this->defaults, $this->requirements, $this->suffix, $this->customToken];
     }
 
     /**
@@ -117,14 +118,14 @@ public function isBound()
      *
      * @return array|bool An array of parameters or false if not matching
      */
-    public function matchesUrl($url, $context = array())
+    public function matchesUrl($url, $context = [])
     {
         if (!$this->compiled) {
             $this->compile();
         }
 
         // check the static prefix uf the URL first. Only use the more expensive preg_match when it matches
-        if ('' !== $this->staticPrefix && 0 !== strpos($url, $this->staticPrefix)) {
+        if ('' !== $this->staticPrefix &&   !str_starts_with($url, $this->staticPrefix)) {
             return false;
         }
         if (!preg_match($this->regex, $url, $matches)) {
@@ -132,7 +133,7 @@ public function matchesUrl($url, $context = array())
         }
 
         $defaults = array_merge($this->getDefaultParameters(), $this->defaults);
-        $parameters = array();
+        $parameters = [];
 
         // *
         if (isset($matches['_star'])) {
@@ -161,7 +162,7 @@ public function matchesUrl($url, $context = array())
      *
      * @return bool true if the parameters matches this route, false otherwise
      */
-    public function matchesParameters($params, $context = array())
+    public function matchesParameters($params, $context = [])
     {
         if (!$this->compiled) {
             $this->compile();
@@ -192,7 +193,7 @@ public function matchesParameters($params, $context = array())
 
         // all $params must be in $variables or $defaults if there is no * in route
         if (!$this->options['extra_parameters_as_query_string']) {
-            if (false === strpos($this->regex, '<_star>') && array_diff_key($params, $this->variables, $defaults)) {
+            if (!str_contains($this->regex, '<_star>') && array_diff_key($params, $this->variables, $defaults)) {
                 return false;
             }
         }
@@ -216,7 +217,7 @@ public function matchesParameters($params, $context = array())
      *
      * @return string The generated URL
      */
-    public function generate($params, $context = array(), $absolute = false)
+    public function generate($params, $context = [], $absolute = false)
     {
         if (!$this->compiled) {
             $this->compile();
@@ -229,7 +230,7 @@ public function generate($params, $context = array(), $absolute = false)
 
         // all params must be given
         if ($diff = array_diff_key($this->variables, $tparams)) {
-            throw new InvalidArgumentException(sprintf('The "%s" route has some missing mandatory parameters (%s).', $this->pattern, implode(', ', $diff)));
+            throw new \InvalidArgumentException(sprintf('The "%s" route has some missing mandatory parameters (%s).', $this->pattern, implode(', ', $diff)));
         }
 
         if ($this->options['generate_shortest_url'] || $this->customToken) {
@@ -237,7 +238,7 @@ public function generate($params, $context = array(), $absolute = false)
         } else {
             // replace variables
             $variables = $this->variables;
-            uasort($variables, array('sfRoute', 'generateCompareVarsByStrlen'));
+            uasort($variables, ['sfRoute', 'generateCompareVarsByStrlen']);
             foreach ($variables as $variable => $value) {
                 $url = str_replace($value, urlencode($tparams[$variable]), $url);
             }
@@ -388,7 +389,7 @@ public function compile()
 
         $this->compiled = true;
         $this->firstOptional = 0;
-        $this->segments = array();
+        $this->segments = [];
 
         $this->preCompile();
 
@@ -396,7 +397,7 @@ public function compile()
 
         // parse
         foreach ($this->tokens as $token) {
-            call_user_func_array(array($this, 'compileFor'.ucfirst(array_shift($token))), $token);
+            call_user_func_array([$this, 'compileFor'.ucfirst(array_shift($token))], $token);
         }
 
         $this->postCompile();
@@ -451,7 +452,7 @@ public function unserialize($serialized)
      */
     protected function generateWithTokens($parameters)
     {
-        $url = array();
+        $url = [];
         $optional = $this->options['generate_shortest_url'];
         $first = true;
         $tokens = array_reverse($this->tokens);
@@ -480,7 +481,7 @@ protected function generateWithTokens($parameters)
 
                 default:
                     // handle custom tokens
-                    if ($segment = call_user_func_array(array($this, 'generateFor'.ucfirst(array_shift($token))), array_merge(array($optional, $parameters), $token))) {
+                    if ($segment = call_user_func_array([$this, 'generateFor'.ucfirst(array_shift($token))], array_merge([$optional, $parameters], $token))) {
                         $url[] = $segment;
                         $optional = false;
                     }
@@ -548,7 +549,7 @@ protected function postCompile()
      */
     protected function tokenize()
     {
-        $this->tokens = array();
+        $this->tokens = [];
         $buffer = $this->pattern;
         $afterASeparator = false;
         $currentSeparator = '';
@@ -560,21 +561,21 @@ protected function tokenize()
                 $this->customToken = true;
             } elseif ($afterASeparator && preg_match('#^'.$this->options['variable_prefix_regex'].'('.$this->options['variable_regex'].')#', $buffer, $match)) {
                 // a variable
-                $this->tokens[] = array('variable', $currentSeparator, $match[0], $match[1]);
+                $this->tokens[] = ['variable', $currentSeparator, $match[0], $match[1]];
 
                 $currentSeparator = '';
                 $buffer = substr($buffer, strlen($match[0]));
                 $afterASeparator = false;
             } elseif ($afterASeparator && preg_match('#^('.$this->options['text_regex'].')(?:'.$this->options['segment_separators_regex'].'|$)#', $buffer, $match)) {
                 // a text
-                $this->tokens[] = array('text', $currentSeparator, $match[1], null);
+                $this->tokens[] = ['text', $currentSeparator, $match[1], null];
 
                 $currentSeparator = '';
                 $buffer = substr($buffer, strlen($match[1]));
                 $afterASeparator = false;
             } elseif (!$afterASeparator && preg_match('#^/|^'.$this->options['segment_separators_regex'].'#', $buffer, $match)) {
                 // beginning of URL (^/) or a separator
-                $this->tokens[] = array('separator', $currentSeparator, $match[0], null);
+                $this->tokens[] = ['separator', $currentSeparator, $match[0], null];
 
                 $currentSeparator = $match[0];
                 $buffer = substr($buffer, strlen($match[0]));
@@ -584,14 +585,14 @@ protected function tokenize()
                 $this->customToken = true;
             } else {
                 // parsing problem
-                throw new InvalidArgumentException(sprintf('Unable to parse "%s" route near "%s".', $this->pattern, $buffer));
+                throw new \InvalidArgumentException(sprintf('Unable to parse "%s" route near "%s".', $this->pattern, $buffer));
             }
         }
 
         // check for suffix
         if ($this->suffix) {
             // treat as a separator
-            $this->tokens[] = array('separator', $currentSeparator, $this->suffix);
+            $this->tokens[] = ['separator', $currentSeparator, $this->suffix];
         }
     }
 
@@ -660,15 +661,15 @@ protected function compileForSeparator($separator, $regexSeparator)
 
     protected function initializeOptions()
     {
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'suffix' => '',
-            'variable_prefixes' => array(':'),
-            'segment_separators' => array('/', '.'),
+            'variable_prefixes' => [':'],
+            'segment_separators' => ['/', '.'],
             'variable_regex' => '[\w\d_]+',
             'text_regex' => '.+?',
             'generate_shortest_url' => true,
             'extra_parameters_as_query_string' => true,
-        ), $this->getDefaultOptions(), $this->options);
+        ], $this->getDefaultOptions(), $this->options);
 
         $preg_quote_hash = function ($a) { return preg_quote($a, '#'); };
 
@@ -693,7 +694,7 @@ protected function initializeOptions()
 
     protected function parseStarParameter($star)
     {
-        $parameters = array();
+        $parameters = [];
         $tmp = explode('/', $star);
         for ($i = 0, $max = count($tmp); $i < $max; $i += 2) {
             // dont allow a param name to be empty - #4173
@@ -707,16 +708,16 @@ protected function parseStarParameter($star)
 
     protected function hasStarParameter()
     {
-        return false !== strpos($this->regex, '<_star>');
+        return str_contains($this->regex, '<_star>');
     }
 
     protected function generateStarParameter($url, $defaults, $parameters)
     {
-        if (false === strpos($this->regex, '<_star>')) {
+        if (!str_contains($this->regex, '<_star>')) {
             return $url;
         }
 
-        $tmp = array();
+        $tmp = [];
         foreach (array_diff_key($parameters, $this->variables, $defaults) as $key => $value) {
             if (is_array($value)) {
                 foreach ($value as $v) {
diff --git a/lib/routing/sfRouteCollection.class.php b/lib/routing/sfRouteCollection.class.php
index 0eb4e28c8..36a8900fd 100644
--- a/lib/routing/sfRouteCollection.class.php
+++ b/lib/routing/sfRouteCollection.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,11 +16,11 @@
  *
  * @version    SVN: $Id$
  */
-class sfRouteCollection implements Iterator
+class sfRouteCollection implements \Iterator
 {
     protected $count = 0;
-    protected $options = array();
-    protected $routes = array();
+    protected $options = [];
+    protected $routes = [];
 
     /**
      * Constructor.
@@ -29,7 +30,7 @@ class sfRouteCollection implements Iterator
     public function __construct(array $options)
     {
         if (!isset($options['name'])) {
-            throw new InvalidArgumentException('You must pass a "name" option to sfRouteCollection');
+            throw new \InvalidArgumentException('You must pass a "name" option to sfRouteCollection');
         }
 
         $this->options = $options;
diff --git a/lib/routing/sfRouting.class.php b/lib/routing/sfRouting.class.php
index 6f330794d..ffbccf187 100644
--- a/lib/routing/sfRouting.class.php
+++ b/lib/routing/sfRouting.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,13 +18,13 @@
  */
 abstract class sfRouting
 {
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
-    /** @var sfCache|null */
+    /** @var \sfCache|null */
     protected $cache;
-    protected $defaultParameters = array();
-    protected $options = array();
+    protected $defaultParameters = [];
+    protected $options = [];
 
     /**
      * Class constructor.
@@ -32,19 +33,19 @@ abstract class sfRouting
      *
      * @param array $options
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, \sfCache $cache = null, $options = [])
     {
         $this->initialize($dispatcher, $cache, $options);
 
         if (!isset($this->options['auto_shutdown']) || $this->options['auto_shutdown']) {
-            register_shutdown_function(array($this, 'shutdown'));
+            register_shutdown_function([$this, 'shutdown']);
         }
     }
 
     /**
      * Returns the routing cache object.
      *
-     * @return sfCache A sfCache instance or null
+     * @return \sfCache A sfCache instance or null
      */
     public function getCache()
     {
@@ -62,11 +63,11 @@ public function getCache()
      *  * debug:          Whether to cache or not (false by default)
      *  * context:        An array of context variables to help URL matching and generation
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param sfCache           $cache      An sfCache instance
-     * @param array             $options    an associative array of initialization options
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param \sfCache           $cache      An sfCache instance
+     * @param array              $options    an associative array of initialization options
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, \sfCache $cache = null, $options = [])
     {
         $this->dispatcher = $dispatcher;
 
@@ -83,13 +84,13 @@ public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null,
         }
 
         if (!isset($options['context'])) {
-            $options['context'] = array();
+            $options['context'] = [];
         }
 
         $this->options = $options;
 
-        $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
-        $this->dispatcher->connect('request.filter_parameters', array($this, 'filterParametersEvent'));
+        $this->dispatcher->connect('user.change_culture', [$this, 'listenToChangeCultureEvent']);
+        $this->dispatcher->connect('request.filter_parameters', [$this, 'filterParametersEvent']);
 
         $this->loadConfiguration();
     }
@@ -111,7 +112,7 @@ public function getOptions()
      */
     public function loadConfiguration()
     {
-        $this->dispatcher->notify(new sfEvent($this, 'routing.load_configuration'));
+        $this->dispatcher->notify(new \sfEvent($this, 'routing.load_configuration'));
     }
 
     /**
@@ -136,7 +137,7 @@ abstract public function getRoutes();
      *
      * @param string $name The route name
      *
-     * @return sfRoute
+     * @return \sfRoute
      */
     abstract public function getRoute($name);
 
@@ -170,7 +171,7 @@ abstract public function clearRoutes();
      *
      * @return string The generated URL
      */
-    abstract public function generate($name, $params = array(), $absolute = false);
+    abstract public function generate($name, $params = [], $absolute = false);
 
     /**
      * Parses a URL to find a matching route and sets internal state.
@@ -229,9 +230,9 @@ public function setDefaultParameters($parameters)
     /**
      * Listens to the user.change_culture event.
      *
-     * @param sfEvent $event An sfEvent instance
+     * @param \sfEvent $event An sfEvent instance
      */
-    public function listenToChangeCultureEvent(sfEvent $event)
+    public function listenToChangeCultureEvent(\sfEvent $event)
     {
         // change the culture in the routing default parameters
         $this->setDefaultParameter('sf_culture', $event['culture']);
@@ -240,12 +241,12 @@ public function listenToChangeCultureEvent(sfEvent $event)
     /**
      * Listens to the request.filter_parameters event.
      *
-     * @param sfEvent $event      An sfEvent instance
-     * @param array   $parameters
+     * @param \sfEvent $event      An sfEvent instance
+     * @param array    $parameters
      *
      * @return array $parameters  An array of parameters for the event
      */
-    public function filterParametersEvent(sfEvent $event, $parameters)
+    public function filterParametersEvent(\sfEvent $event, $parameters)
     {
         $context = $event->getParameters();
 
@@ -268,14 +269,14 @@ public function shutdown()
     protected function fixGeneratedUrl($url, $absolute = false)
     {
         if (isset($this->options['context']['prefix'])) {
-            if (0 === strpos($url, 'http')) {
+            if (str_starts_with($url, 'http')) {
                 $url = preg_replace('#https?\://[^/]+#', '$0'.$this->options['context']['prefix'], $url);
             } else {
                 $url = $this->options['context']['prefix'].$url;
             }
         }
 
-        if ($absolute && isset($this->options['context']['host']) && 0 !== strpos($url, 'http')) {
+        if ($absolute && isset($this->options['context']['host']) &&   !str_starts_with($url, 'http')) {
             $url = 'http'.(isset($this->options['context']['is_secure']) && $this->options['context']['is_secure'] ? 's' : '').'://'.$this->options['context']['host'].$url;
         }
 
diff --git a/lib/service/sfServiceContainer.class.php b/lib/service/sfServiceContainer.class.php
index 4c47a6fe6..b11fb2235 100644
--- a/lib/service/sfServiceContainer.class.php
+++ b/lib/service/sfServiceContainer.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -40,11 +41,11 @@
  *
  * @version    SVN: $Id$
  */
-class sfServiceContainer implements sfServiceContainerInterface
+class sfServiceContainer implements \sfServiceContainerInterface
 {
-    protected $serviceIds = array();
-    protected $parameters = array();
-    protected $services = array();
+    protected $serviceIds = [];
+    protected $parameters = [];
+    protected $services = [];
     protected $count = 0;
 
     /**
@@ -52,7 +53,7 @@ class sfServiceContainer implements sfServiceContainerInterface
      *
      * @param array $parameters An array of parameters
      */
-    public function __construct(array $parameters = array())
+    public function __construct(array $parameters = [])
     {
         $this->setParameters($parameters);
         $this->setService('service_container', $this);
@@ -65,7 +66,7 @@ public function __construct(array $parameters = array())
      */
     public function setParameters(array $parameters)
     {
-        $this->parameters = array();
+        $this->parameters = [];
         foreach ($parameters as $key => $value) {
             $this->parameters[strtolower($key)] = $value;
         }
@@ -106,11 +107,11 @@ public function getParameter($name)
             return $this->parameters[strtolower($name)];
         }
 
-        if (sfConfig::has($name)) {
-            return sfConfig::get($name);
+        if (\sfConfig::has($name)) {
+            return \sfConfig::get($name);
         }
 
-        throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+        throw new \InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
     }
 
     /**
@@ -181,7 +182,7 @@ public function getService($id)
             return $this->{$method}();
         }
 
-        throw new InvalidArgumentException(sprintf('The service "%s" does not exist.', $id));
+        throw new \InvalidArgumentException(sprintf('The service "%s" does not exist.', $id));
     }
 
     /**
@@ -191,8 +192,8 @@ public function getService($id)
      */
     public function getServiceIds()
     {
-        $ids = array();
-        $r = new ReflectionClass($this);
+        $ids = [];
+        $r = new \ReflectionClass($this);
         foreach ($r->getMethods() as $method) {
             if (preg_match('/^get(.+)Service$/', $name = $method->getName(), $match)) {
                 $ids[] = self::underscore($match[1]);
@@ -204,11 +205,11 @@ public function getServiceIds()
 
     public static function camelize($id)
     {
-        return strtr(ucwords(strtr($id, array('_' => ' ', '-' => ' ', '.' => '_ '))), array(' ' => ''));
+        return strtr(ucwords(strtr($id, ['_' => ' ', '-' => ' ', '.' => '_ '])), [' ' => '']);
     }
 
     public static function underscore($id)
     {
-        return strtolower(preg_replace(array('/_/', '/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('.', '\\1_\\2', '\\1_\\2'), $id));
+        return strtolower(preg_replace(['/_/', '/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['.', '\\1_\\2', '\\1_\\2'], $id));
     }
 }
diff --git a/lib/service/sfServiceContainerBuilder.class.php b/lib/service/sfServiceContainerBuilder.class.php
index 6e5e109f3..ff6811637 100644
--- a/lib/service/sfServiceContainerBuilder.class.php
+++ b/lib/service/sfServiceContainerBuilder.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,11 +16,11 @@
  *
  * @version    SVN: $Id: sfServiceContainerBuilder.php 269 2009-03-26 20:39:16Z fabien $
  */
-class sfServiceContainerBuilder extends sfServiceContainer
+class sfServiceContainerBuilder extends \sfServiceContainer
 {
-    protected $definitions = array();
-    protected $aliases = array();
-    protected $loading = array();
+    protected $definitions = [];
+    protected $aliases = [];
+    protected $loading = [];
 
     /**
      * Sets a service.
@@ -60,9 +61,9 @@ public function getService($id)
     {
         try {
             return parent::getService($id);
-        } catch (InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             if (isset($this->loading[$id])) {
-                throw new LogicException(sprintf('The service "%s" has a circular reference to itself.', $id));
+                throw new \LogicException(sprintf('The service "%s" has a circular reference to itself.', $id));
             }
 
             if (!$this->hasServiceDefinition($id) && isset($this->aliases[$id])) {
@@ -125,11 +126,11 @@ public function getAliases()
      * @param string $id    The service identifier
      * @param string $class The service class
      *
-     * @return sfServiceDefinition A sfServiceDefinition instance
+     * @return \sfServiceDefinition A sfServiceDefinition instance
      */
     public function register($id, $class)
     {
-        return $this->setServiceDefinition($id, new sfServiceDefinition($class));
+        return $this->setServiceDefinition($id, new \sfServiceDefinition($class));
     }
 
     /**
@@ -151,7 +152,7 @@ public function addServiceDefinitions(array $definitions)
      */
     public function setServiceDefinitions(array $definitions)
     {
-        $this->definitions = array();
+        $this->definitions = [];
         $this->addServiceDefinitions($definitions);
     }
 
@@ -168,12 +169,12 @@ public function getServiceDefinitions()
     /**
      * Sets a service definition.
      *
-     * @param string              $id         The service identifier
-     * @param sfServiceDefinition $definition A sfServiceDefinition instance
+     * @param string               $id         The service identifier
+     * @param \sfServiceDefinition $definition A sfServiceDefinition instance
      *
-     * @return sfServiceDefinition
+     * @return \sfServiceDefinition
      */
-    public function setServiceDefinition($id, sfServiceDefinition $definition)
+    public function setServiceDefinition($id, \sfServiceDefinition $definition)
     {
         unset($this->aliases[$id]);
 
@@ -197,14 +198,14 @@ public function hasServiceDefinition($id)
      *
      * @param string $id The service identifier
      *
-     * @return sfServiceDefinition A sfServiceDefinition instance
+     * @return \sfServiceDefinition A sfServiceDefinition instance
      *
      * @throw InvalidArgumentException if the service definition does not exist
      */
     public function getServiceDefinition($id)
     {
         if (!$this->hasServiceDefinition($id)) {
-            throw new InvalidArgumentException(sprintf('The service definition "%s" does not exist.', $id));
+            throw new \InvalidArgumentException(sprintf('The service definition "%s" does not exist.', $id));
         }
 
         return $this->definitions[$id];
@@ -222,7 +223,7 @@ public function getServiceDefinition($id)
     public function resolveValue($value)
     {
         if (is_array($value)) {
-            $args = array();
+            $args = [];
             foreach ($value as $k => $v) {
                 $args[$this->resolveValue($k)] = $this->resolveValue($v);
             }
@@ -232,7 +233,7 @@ public function resolveValue($value)
             if (preg_match('/^%([^%]+)%$/', $value, $match)) {
                 $value = $this->getParameter($match[1]);
             } else {
-                $value = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), $value));
+                $value = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', [$this, 'replaceParameter'], $value));
             }
         }
 
@@ -249,8 +250,8 @@ public function resolveValue($value)
     public function resolveServices($value)
     {
         if (is_array($value)) {
-            $value = array_map(array($this, 'resolveServices'), $value);
-        } elseif (is_object($value) && $value instanceof sfServiceReference) {
+            $value = array_map([$this, 'resolveServices'], $value);
+        } elseif (is_object($value) && $value instanceof \sfServiceReference) {
             $value = $this->getService((string) $value);
         }
 
@@ -260,39 +261,39 @@ public function resolveServices($value)
     /**
      * Creates a service for a service definition.
      *
-     * @param sfServiceDefinition $definition A service definition instance
+     * @param \sfServiceDefinition $definition A service definition instance
      *
      * @return object The service described by the service definition
      */
-    protected function createService(sfServiceDefinition $definition)
+    protected function createService(\sfServiceDefinition $definition)
     {
         if (null !== $definition->getFile()) {
             require_once $this->resolveValue($definition->getFile());
         }
 
-        $r = new ReflectionClass($this->resolveValue($definition->getClass()));
+        $r = new \ReflectionClass($this->resolveValue($definition->getClass()));
 
         $arguments = $this->resolveServices($this->resolveValue($definition->getArguments()));
 
         if (null !== $definition->getConstructor()) {
-            $service = call_user_func_array(array($this->resolveValue($definition->getClass()), $definition->getConstructor()), $arguments);
+            $service = call_user_func_array([$this->resolveValue($definition->getClass()), $definition->getConstructor()], $arguments);
         } else {
             $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
         }
 
         foreach ($definition->getMethodCalls() as $call) {
-            call_user_func_array(array($service, $call[0]), $this->resolveServices($this->resolveValue($call[1])));
+            call_user_func_array([$service, $call[0]], $this->resolveServices($this->resolveValue($call[1])));
         }
 
         if ($callable = $definition->getConfigurator()) {
-            if (is_array($callable) && is_object($callable[0]) && $callable[0] instanceof sfServiceReference) {
+            if (is_array($callable) && is_object($callable[0]) && $callable[0] instanceof \sfServiceReference) {
                 $callable[0] = $this->getService((string) $callable[0]);
             } elseif (is_array($callable)) {
                 $callable[0] = $this->resolveValue($callable[0]);
             }
 
             if (!is_callable($callable)) {
-                throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
+                throw new \InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
             }
 
             call_user_func($callable, $service);
diff --git a/lib/service/sfServiceContainerDumper.class.php b/lib/service/sfServiceContainerDumper.class.php
index 2fca97b3b..a6906f9bf 100644
--- a/lib/service/sfServiceContainerDumper.class.php
+++ b/lib/service/sfServiceContainerDumper.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,16 +16,16 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfServiceContainerDumper implements sfServiceContainerDumperInterface
+abstract class sfServiceContainerDumper implements \sfServiceContainerDumperInterface
 {
     protected $container;
 
     /**
      * Constructor.
      *
-     * @param sfServiceContainerBuilder $container The service container to dump
+     * @param \sfServiceContainerBuilder $container The service container to dump
      */
-    public function __construct(sfServiceContainerBuilder $container)
+    public function __construct(\sfServiceContainerBuilder $container)
     {
         $this->container = $container;
     }
@@ -36,8 +37,8 @@ public function __construct(sfServiceContainerBuilder $container)
      *
      * @return string The representation of the service container
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
-        throw new LogicException('You must extend this abstract class and implement the dump() method.');
+        throw new \LogicException('You must extend this abstract class and implement the dump() method.');
     }
 }
diff --git a/lib/service/sfServiceContainerDumperGraphviz.class.php b/lib/service/sfServiceContainerDumperGraphviz.class.php
index 80e1f0a61..ea5fe4a46 100644
--- a/lib/service/sfServiceContainerDumperGraphviz.class.php
+++ b/lib/service/sfServiceContainerDumperGraphviz.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +20,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfServiceContainerDumperGraphviz extends sfServiceContainerDumper
+class sfServiceContainerDumperGraphviz extends \sfServiceContainerDumper
 {
     protected $nodes;
     protected $edges;
@@ -40,18 +41,18 @@ class sfServiceContainerDumperGraphviz extends sfServiceContainerDumper
      *
      * @return string The dot representation of the service container
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
-        $this->options = array(
-            'graph' => array('ratio' => 'compress'),
-            'node' => array('fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'),
-            'edge' => array('fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5),
-            'node.instance' => array('fillcolor' => '#9999ff', 'style' => 'filled'),
-            'node.definition' => array('fillcolor' => '#eeeeee'),
-            'node.missing' => array('fillcolor' => '#ff9999', 'style' => 'filled'),
-        );
-
-        foreach (array('graph', 'node', 'edge', 'node.instance', 'node.definition', 'node.missing') as $key) {
+        $this->options = [
+            'graph' => ['ratio' => 'compress'],
+            'node' => ['fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'],
+            'edge' => ['fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5],
+            'node.instance' => ['fillcolor' => '#9999ff', 'style' => 'filled'],
+            'node.definition' => ['fillcolor' => '#eeeeee'],
+            'node.missing' => ['fillcolor' => '#ff9999', 'style' => 'filled'],
+        ];
+
+        foreach (['graph', 'node', 'edge', 'node.instance', 'node.definition', 'node.missing'] as $key) {
             if (isset($options[$key])) {
                 $this->options[$key] = array_merge($this->options[$key], $options[$key]);
             }
@@ -59,7 +60,7 @@ public function dump(array $options = array())
 
         $this->nodes = $this->findNodes();
 
-        $this->edges = array();
+        $this->edges = [];
         foreach ($this->container->getServiceDefinitions() as $id => $definition) {
             $this->edges[$id] = $this->findEdges($id, $definition->getArguments(), true, '');
 
@@ -100,20 +101,20 @@ protected function addEdges()
 
     protected function findEdges($id, $arguments, $required, $name)
     {
-        $edges = array();
+        $edges = [];
         foreach ($arguments as $argument) {
-            if (is_object($argument) && $argument instanceof sfServiceParameter) {
+            if (is_object($argument) && $argument instanceof \sfServiceParameter) {
                 $argument = $this->container->hasParameter($argument) ? $this->container->getParameter($argument) : null;
             } elseif (is_string($argument) && preg_match('/^%([^%]+)%$/', $argument, $match)) {
                 $argument = $this->container->hasParameter($match[1]) ? $this->container->getParameter($match[1]) : null;
             }
 
-            if ($argument instanceof sfServiceReference) {
+            if ($argument instanceof \sfServiceReference) {
                 if (!$this->container->hasService((string) $argument)) {
-                    $this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
+                    $this->nodes[(string) $argument] = ['name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']];
                 }
 
-                $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument);
+                $edges[] = ['name' => $name, 'required' => $required, 'to' => $argument];
             } elseif (is_array($argument)) {
                 $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name));
             }
@@ -124,14 +125,14 @@ protected function findEdges($id, $arguments, $required, $name)
 
     protected function findNodes()
     {
-        $nodes = array();
+        $nodes = [];
 
         $container = clone $this->container;
 
         foreach ($container->getServiceDefinitions() as $id => $definition) {
-            $nodes[$id] = array('class' => $this->getValue($definition->getClass()), 'attributes' => array_merge($this->options['node.definition'], array('style' => $definition->isShared() ? 'filled' : 'dotted')));
+            $nodes[$id] = ['class' => $this->getValue($definition->getClass()), 'attributes' => array_merge($this->options['node.definition'], ['style' => $definition->isShared() ? 'filled' : 'dotted'])];
 
-            $container->setServiceDefinition($id, new sfServiceDefinition('stdClass'));
+            $container->setServiceDefinition($id, new \sfServiceDefinition('stdClass'));
         }
 
         foreach ($container->getServiceIds() as $id) {
@@ -140,7 +141,7 @@ protected function findNodes()
             }
 
             if (!$container->hasServiceDefinition($id)) {
-                $nodes[$id] = array('class' => get_class($container->getService($id)), 'attributes' => $this->options['node.instance']);
+                $nodes[$id] = ['class' => get_class($container->getService($id)), 'attributes' => $this->options['node.instance']];
             }
         }
 
@@ -171,7 +172,7 @@ protected function endDot()
 
     protected function addAttributes($attributes)
     {
-        $code = array();
+        $code = [];
         foreach ($attributes as $k => $v) {
             $code[] = sprintf('%s="%s"', $k, $v);
         }
@@ -181,7 +182,7 @@ protected function addAttributes($attributes)
 
     protected function addOptions($options)
     {
-        $code = array();
+        $code = [];
         foreach ($options as $k => $v) {
             $code[] = sprintf('%s="%s"', $k, $v);
         }
@@ -196,7 +197,7 @@ protected function dotize($id)
 
     protected function getAliases($id)
     {
-        $aliases = array();
+        $aliases = [];
         foreach ($this->container->getAliases() as $alias => $origin) {
             if ($id == $origin) {
                 $aliases[] = $alias;
diff --git a/lib/service/sfServiceContainerDumperInterface.class.php b/lib/service/sfServiceContainerDumperInterface.class.php
index 6c37579cd..863e40ffe 100644
--- a/lib/service/sfServiceContainerDumperInterface.class.php
+++ b/lib/service/sfServiceContainerDumperInterface.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,5 +18,5 @@
  */
 interface sfServiceContainerDumperInterface
 {
-    public function dump(array $options = array());
+    public function dump(array $options = []);
 }
diff --git a/lib/service/sfServiceContainerDumperPhp.class.php b/lib/service/sfServiceContainerDumperPhp.class.php
index b356006b5..3b00b3130 100644
--- a/lib/service/sfServiceContainerDumperPhp.class.php
+++ b/lib/service/sfServiceContainerDumperPhp.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfServiceContainerDumperPhp extends sfServiceContainerDumper
+class sfServiceContainerDumperPhp extends \sfServiceContainerDumper
 {
     /**
      * Dumps the service container as a PHP class.
@@ -29,12 +30,12 @@ class sfServiceContainerDumperPhp extends sfServiceContainerDumper
      *
      * @return string A PHP class representing of the service container
      */
-    public function dump(array $options = array())
+    public function dump(array $options = [])
     {
-        $options = array_merge(array(
+        $options = array_merge([
             'class' => 'ProjectServiceContainer',
             'base_class' => 'sfServiceContainer',
-        ), $options);
+        ], $options);
 
         return
           $this->startClass($options['class'], $options['base_class']).
@@ -50,8 +51,8 @@ public function replaceParameter($match)
     }
 
     /**
-     * @param string              $id
-     * @param sfServiceDefinition $definition
+     * @param string               $id
+     * @param \sfServiceDefinition $definition
      *
      * @return string
      */
@@ -63,8 +64,8 @@ protected function addServiceInclude($id, $definition)
     }
 
     /**
-     * @param string              $id
-     * @param sfServiceDefinition $definition
+     * @param string               $id
+     * @param \sfServiceDefinition $definition
      *
      * @return string
      */
@@ -80,8 +81,8 @@ protected function addServiceShared($id, $definition)
     }
 
     /**
-     * @param string              $id
-     * @param sfServiceDefinition $definition
+     * @param string               $id
+     * @param \sfServiceDefinition $definition
      *
      * @return string
      */
@@ -105,8 +106,8 @@ protected function addServiceReturn($id, $definition)
     }
 
     /**
-     * @param string              $id
-     * @param sfServiceDefinition $definition
+     * @param string               $id
+     * @param \sfServiceDefinition $definition
      *
      * @return string
      */
@@ -114,7 +115,7 @@ protected function addServiceInstance($id, $definition)
     {
         $class = $this->dumpValue($definition->getClass());
 
-        $arguments = array();
+        $arguments = [];
         foreach ($definition->getArguments() as $value) {
             $arguments[] = $this->dumpValue($value);
         }
@@ -131,8 +132,8 @@ protected function addServiceInstance($id, $definition)
     }
 
     /**
-     * @param string              $id
-     * @param sfServiceDefinition $definition
+     * @param string               $id
+     * @param \sfServiceDefinition $definition
      *
      * @return string
      */
@@ -140,7 +141,7 @@ protected function addServiceMethodCalls($id, $definition)
     {
         $calls = '';
         foreach ($definition->getMethodCalls() as $call) {
-            $arguments = array();
+            $arguments = [];
             foreach ($call[1] as $value) {
                 $arguments[] = $this->dumpValue($value);
             }
@@ -152,8 +153,8 @@ protected function addServiceMethodCalls($id, $definition)
     }
 
     /**
-     * @param string              $id
-     * @param sfServiceDefinition $definition
+     * @param string               $id
+     * @param \sfServiceDefinition $definition
      *
      * @return string
      */
@@ -164,7 +165,7 @@ protected function addServiceConfigurator($id, $definition)
         }
 
         if (is_array($callable)) {
-            if (is_object($callable[0]) && $callable[0] instanceof sfServiceReference) {
+            if (is_object($callable[0]) && $callable[0] instanceof \sfServiceReference) {
                 return sprintf("    %s->%s(\$instance);\n", $this->getServiceCall((string) $callable[0]), $callable[1]);
             }
 
@@ -176,7 +177,7 @@ protected function addServiceConfigurator($id, $definition)
 
     protected function addService($id, $definition)
     {
-        $name = sfServiceContainer::camelize($id);
+        $name = \sfServiceContainer::camelize($id);
 
         $code = <<<EOF
 
@@ -198,7 +199,7 @@ protected function get{$name}Service()
 
     protected function addServiceAlias($alias, $id)
     {
-        $name = sfServiceContainer::camelize($alias);
+        $name = \sfServiceContainer::camelize($alias);
 
         return <<<EOF
 
@@ -270,13 +271,13 @@ protected function getDefaultParameters()
 
     protected function exportParameters($parameters, $indent = 6)
     {
-        $php = array();
+        $php = [];
         foreach ($parameters as $key => $value) {
             if (is_array($value)) {
                 $value = $this->exportParameters($value, $indent + 2);
-            } elseif ($value instanceof sfServiceReference) {
+            } elseif ($value instanceof \sfServiceReference) {
                 $value = sprintf("new sfServiceReference('%s')", $value);
-            } elseif ($value instanceof sfServiceParameter) {
+            } elseif ($value instanceof \sfServiceParameter) {
                 $value = sprintf("\$this->getParameter('%s')", $value);
             } else {
                 $value = var_export($value, true);
@@ -299,17 +300,17 @@ protected function endClass()
     protected function dumpValue($value)
     {
         if (is_array($value)) {
-            $code = array();
+            $code = [];
             foreach ($value as $k => $v) {
                 $code[] = sprintf('%s => %s', $this->dumpValue($k), $this->dumpValue($v));
             }
 
             return sprintf('array(%s)', implode(', ', $code));
         }
-        if (is_object($value) && $value instanceof sfServiceReference) {
+        if (is_object($value) && $value instanceof \sfServiceReference) {
             return $this->getServiceCall((string) $value);
         }
-        if (is_object($value) && $value instanceof sfServiceParameter) {
+        if (is_object($value) && $value instanceof \sfServiceParameter) {
             return sprintf("\$this->getParameter('%s')", strtolower($value));
         }
         if (is_string($value)) {
@@ -319,13 +320,13 @@ protected function dumpValue($value)
                 return sprintf("\$this->getParameter('%s')", strtolower($match[1]));
             }
 
-            $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), var_export($value, true)));
+            $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', [$this, 'replaceParameter'], var_export($value, true)));
 
             // optimize string
-            return preg_replace(array("/^''\\./", "/\\.''$/", "/\\.''\\./"), array('', '', '.'), $code);
+            return preg_replace(["/^''\\./", "/\\.''$/", "/\\.''\\./"], ['', '', '.'], $code);
         }
         if (is_object($value) || is_resource($value)) {
-            throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
+            throw new \RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
         }
 
         return var_export($value, true);
diff --git a/lib/service/sfServiceContainerInterface.class.php b/lib/service/sfServiceContainerInterface.class.php
index 217552234..6cde2bb95 100644
--- a/lib/service/sfServiceContainerInterface.class.php
+++ b/lib/service/sfServiceContainerInterface.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/service/sfServiceContainerLoader.class.php b/lib/service/sfServiceContainerLoader.class.php
index a27c642c9..9aa28f138 100644
--- a/lib/service/sfServiceContainerLoader.class.php
+++ b/lib/service/sfServiceContainerLoader.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,16 +16,16 @@
  *
  * @version    SVN: $Id: sfServiceContainerLoader.php 267 2009-03-26 19:56:18Z fabien $
  */
-abstract class sfServiceContainerLoader implements sfServiceContainerLoaderInterface
+abstract class sfServiceContainerLoader implements \sfServiceContainerLoaderInterface
 {
     protected $container;
 
     /**
      * Constructor.
      *
-     * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
+     * @param \sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
      */
-    public function __construct(sfServiceContainerBuilder $container = null)
+    public function __construct(\sfServiceContainerBuilder $container = null)
     {
         $this->container = $container;
     }
@@ -32,9 +33,9 @@ public function __construct(sfServiceContainerBuilder $container = null)
     /**
      * Sets the service container attached to this loader.
      *
-     * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
+     * @param \sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
      */
-    public function setServiceContainer(sfServiceContainerBuilder $container)
+    public function setServiceContainer(\sfServiceContainerBuilder $container)
     {
         $this->container = $container;
     }
@@ -67,7 +68,7 @@ public function setServiceContainer(sfServiceContainerBuilder $container)
     public function load($resource)
     {
         if (!$this->container) {
-            throw new LogicException('You must attach the loader to a service container.');
+            throw new \LogicException('You must attach the loader to a service container.');
         }
 
         $resources = func_get_args();
diff --git a/lib/service/sfServiceContainerLoaderArray.class.php b/lib/service/sfServiceContainerLoaderArray.class.php
index ad412cd41..ddcfbb989 100644
--- a/lib/service/sfServiceContainerLoaderArray.class.php
+++ b/lib/service/sfServiceContainerLoaderArray.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,14 +16,14 @@
  *
  * @author     Jerome Macias <jmacias@groupe-exp.com>
  */
-class sfServiceContainerLoaderArray extends sfServiceContainerLoader
+class sfServiceContainerLoaderArray extends \sfServiceContainerLoader
 {
     public function doLoad($content)
     {
         $this->validate($content);
 
-        $parameters = array();
-        $definitions = array();
+        $parameters = [];
+        $definitions = [];
 
         // parameters
         if (isset($content['parameters'])) {
@@ -38,18 +39,18 @@ public function doLoad($content)
             }
         }
 
-        return array($definitions, $parameters);
+        return [$definitions, $parameters];
     }
 
     protected function validate($content)
     {
         if (!is_array($content)) {
-            throw new InvalidArgumentException('The service definition is not valid.');
+            throw new \InvalidArgumentException('The service definition is not valid.');
         }
 
         foreach (array_keys($content) as $key) {
-            if (!in_array($key, array('parameters', 'services'))) {
-                throw new InvalidArgumentException(sprintf('The service defintion is not valid ("%s" is not recognized).', $key));
+            if (!in_array($key, ['parameters', 'services'])) {
+                throw new \InvalidArgumentException(sprintf('The service defintion is not valid ("%s" is not recognized).', $key));
             }
         }
 
@@ -58,11 +59,11 @@ protected function validate($content)
 
     protected function parseDefinition($service)
     {
-        if (is_string($service) && 0 === strpos($service, '@')) {
+        if (is_string($service) &&   str_starts_with($service, '@')) {
             return substr($service, 1);
         }
 
-        $definition = new sfServiceDefinition($service['class']);
+        $definition = new \sfServiceDefinition($service['class']);
 
         if (isset($service['shared'])) {
             $definition->setShared($service['shared']);
@@ -84,7 +85,7 @@ protected function parseDefinition($service)
             if (is_string($service['configurator'])) {
                 $definition->setConfigurator($service['configurator']);
             } else {
-                $definition->setConfigurator(array($this->resolveServices($service['configurator'][0]), $service['configurator'][1]));
+                $definition->setConfigurator([$this->resolveServices($service['configurator'][0]), $service['configurator'][1]]);
             }
         }
 
@@ -100,9 +101,9 @@ protected function parseDefinition($service)
     protected function resolveServices($value)
     {
         if (is_array($value)) {
-            $value = array_map(array($this, 'resolveServices'), $value);
-        } elseif (is_string($value) && 0 === strpos($value, '@')) {
-            $value = new sfServiceReference(substr($value, 1));
+            $value = array_map([$this, 'resolveServices'], $value);
+        } elseif (is_string($value) &&   str_starts_with($value, '@')) {
+            $value = new \sfServiceReference(substr($value, 1));
         }
 
         return $value;
diff --git a/lib/service/sfServiceContainerLoaderInterface.class.php b/lib/service/sfServiceContainerLoaderInterface.class.php
index f8f71e580..a3ea97c78 100644
--- a/lib/service/sfServiceContainerLoaderInterface.class.php
+++ b/lib/service/sfServiceContainerLoaderInterface.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/service/sfServiceDefinition.class.php b/lib/service/sfServiceDefinition.class.php
index 8cc76edb8..8e3e538a2 100644
--- a/lib/service/sfServiceDefinition.class.php
+++ b/lib/service/sfServiceDefinition.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,8 +22,8 @@ class sfServiceDefinition
     protected $file;
     protected $constructor;
     protected $shared = true;
-    protected $arguments = array();
-    protected $calls = array();
+    protected $arguments = [];
+    protected $calls = [];
     protected $configurator;
 
     /**
@@ -31,7 +32,7 @@ class sfServiceDefinition
      * @param string $class     The service class
      * @param array  $arguments An array of arguments to pass to the service constructor
      */
-    public function __construct($class, array $arguments = array())
+    public function __construct($class, array $arguments = [])
     {
         $this->class = $class;
         $this->arguments = $arguments;
@@ -42,7 +43,7 @@ public function __construct($class, array $arguments = array())
      *
      * @param string $method The method name
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function setConstructor($method)
     {
@@ -54,7 +55,7 @@ public function setConstructor($method)
     /**
      * Gets the constructor method.
      *
-     * @return sfServiceDefinition The constructor method name
+     * @return \sfServiceDefinition The constructor method name
      */
     public function getConstructor()
     {
@@ -66,7 +67,7 @@ public function getConstructor()
      *
      * @param string $class The service class
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function setClass($class)
     {
@@ -90,7 +91,7 @@ public function getClass()
      *
      * @param array $arguments An array of arguments
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function setArguments(array $arguments)
     {
@@ -104,7 +105,7 @@ public function setArguments(array $arguments)
      *
      * @param mixed $argument An argument
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function addArgument($argument)
     {
@@ -128,11 +129,11 @@ public function getArguments()
      *
      * @param array $calls An array of method calls
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
-    public function setMethodCalls(array $calls = array())
+    public function setMethodCalls(array $calls = [])
     {
-        $this->calls = array();
+        $this->calls = [];
         foreach ($calls as $call) {
             $this->addMethodCall($call[0], $call[1]);
         }
@@ -146,11 +147,11 @@ public function setMethodCalls(array $calls = array())
      * @param string $method    The method name to call
      * @param array  $arguments An array of arguments to pass to the method call
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
-    public function addMethodCall($method, array $arguments = array())
+    public function addMethodCall($method, array $arguments = [])
     {
-        $this->calls[] = array($method, $arguments);
+        $this->calls[] = [$method, $arguments];
 
         return $this;
     }
@@ -170,7 +171,7 @@ public function getMethodCalls()
      *
      * @param string $file A full pathname to include
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function setFile($file)
     {
@@ -194,7 +195,7 @@ public function getFile()
      *
      * @param bool $shared Whether the service must be shared or not
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function setShared($shared)
     {
@@ -218,7 +219,7 @@ public function isShared()
      *
      * @param mixed $callable A PHP callable
      *
-     * @return sfServiceDefinition The current instance
+     * @return \sfServiceDefinition The current instance
      */
     public function setConfigurator($callable)
     {
diff --git a/lib/service/sfServiceParameter.class.php b/lib/service/sfServiceParameter.class.php
index b9ccbdc97..c38c58ca9 100644
--- a/lib/service/sfServiceParameter.class.php
+++ b/lib/service/sfServiceParameter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/service/sfServiceReference.class.php b/lib/service/sfServiceReference.class.php
index e0beeb2ea..34c7a96b3 100644
--- a/lib/service/sfServiceReference.class.php
+++ b/lib/service/sfServiceReference.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/storage/sfCacheSessionStorage.class.php b/lib/storage/sfCacheSessionStorage.class.php
index 6dd0442c3..7e7afa84a 100644
--- a/lib/storage/sfCacheSessionStorage.class.php
+++ b/lib/storage/sfCacheSessionStorage.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * sfCacheSessionStorage manages session storage via a signed cookie and cache backend.
  *
@@ -8,28 +17,28 @@
  *
  * @author     Dustin Whittle <dustin.whittle@symfony-project.com>
  */
-class sfCacheSessionStorage extends sfStorage
+class sfCacheSessionStorage extends \sfStorage
 {
     /** @var string */
     protected $id;
 
-    /** @var sfContext */
+    /** @var \sfContext */
     protected $context;
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
-    /** @var sfWebRequest */
+    /** @var \sfWebRequest */
     protected $request;
 
-    /** @var sfWebResponse */
+    /** @var \sfWebResponse */
     protected $response;
 
-    /** @var sfCache|null */
+    /** @var \sfCache|null */
     protected $cache;
 
     /** @var array */
-    protected $data = array();
+    protected $data = [];
 
     /** @var bool */
     protected $dataChanged = false;
@@ -47,9 +56,9 @@ class sfCacheSessionStorage extends sfStorage
      *
      * @return bool true, when initialization completes successfully
      *
-     * @throws sfInitializationException If an error occurs while initializing this Storage
+     * @throws \sfInitializationException If an error occurs while initializing this Storage
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
         // initialize parent
 
@@ -59,22 +68,22 @@ public function initialize($options = array())
             $options['session_cookie_httponly'] = $options['session_cookie_http_only'];
         }
 
-        parent::initialize(array_merge(array('session_name' => 'sfproject',
+        parent::initialize(array_merge(['session_name' => 'sfproject',
             'session_cookie_lifetime' => '+30 days',
             'session_cookie_path' => '/',
             'session_cookie_domain' => null,
             'session_cookie_secure' => false,
             'session_cookie_httponly' => true,
-            'session_cookie_secret' => 'sf$ecret'), $options));
+            'session_cookie_secret' => 'sf$ecret'], $options));
 
         // create cache instance
         if (isset($this->options['cache']) && $this->options['cache']['class']) {
-            $this->cache = new $this->options['cache']['class'](is_array($this->options['cache']['param']) ? $this->options['cache']['param'] : array());
+            $this->cache = new $this->options['cache']['class'](is_array($this->options['cache']['param']) ? $this->options['cache']['param'] : []);
         } else {
-            throw new InvalidArgumentException('sfCacheSessionStorage requires cache option.');
+            throw new \InvalidArgumentException('sfCacheSessionStorage requires cache option.');
         }
 
-        $this->context = sfContext::getInstance();
+        $this->context = \sfContext::getInstance();
 
         $this->dispatcher = $this->context->getEventDispatcher();
         $this->request = $this->context->getRequest();
@@ -82,7 +91,7 @@ public function initialize($options = array())
 
         $cookie = $this->request->getCookie($this->options['session_name']);
 
-        if (null !== $cookie && false !== strpos($cookie, ':')) {
+        if (null !== $cookie &&   str_contains($cookie, ':')) {
             // split cookie data id:signature(id+secret)
             list($id, $signature) = explode(':', $cookie, 2);
 
@@ -105,8 +114,8 @@ public function initialize($options = array())
             // generate new id based on random # / ip / user agent / secret
             $this->id = md5(mt_rand(0, 999999).$ip.$ua.$this->options['session_cookie_secret']);
 
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('New session created')));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['New session created']));
             }
 
             // only send cookie when id is issued
@@ -120,13 +129,13 @@ public function initialize($options = array())
                 $this->options['session_cookie_httponly']
             );
 
-            $this->data = array();
+            $this->data = [];
         } else {
             // load data from cache. Watch out for the default case. We could
             // serialize(array()) as the default to the call but that would be a performance hit
             $raw = $this->cache->get($this->id, null);
             if (null === $raw) {
-                $this->data = array();
+                $this->data = [];
             } else {
                 $data = @unserialize($raw);
                 // We test 'b:0' special case, because such a string would result
@@ -140,8 +149,8 @@ public function initialize($options = array())
                 }
             }
 
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Restored previous session')));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Restored previous session']));
             }
         }
         session_id($this->id);
@@ -215,12 +224,12 @@ public function remove($key)
      *
      * @return bool True if session regenerated, false if error
      *
-     * @throws sfStorageException If an error occurs while regenerating this storage
+     * @throws \sfStorageException If an error occurs while regenerating this storage
      */
     public function regenerate($destroy = false)
     {
         if ($destroy) {
-            $this->data = array();
+            $this->data = [];
             $this->cache->remove($this->id);
         }
 
@@ -255,23 +264,23 @@ public function expire()
         // destroy data and regenerate id
         $this->regenerate(true);
 
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('new session created due to expiraton')));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['new session created due to expiraton']));
         }
     }
 
     /**
      * Executes the shutdown procedure.
      *
-     * @throws sfStorageException If an error occurs while shutting down this storage
+     * @throws \sfStorageException If an error occurs while shutting down this storage
      */
     public function shutdown()
     {
         // only update cache if session has changed
         if (true === $this->dataChanged) {
             $this->cache->set($this->id, serialize($this->data));
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Storing session to cache')));
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Storing session to cache']));
             }
         }
     }
diff --git a/lib/storage/sfDatabaseSessionStorage.class.php b/lib/storage/sfDatabaseSessionStorage.class.php
index 580d4b209..9627ac527 100644
--- a/lib/storage/sfDatabaseSessionStorage.class.php
+++ b/lib/storage/sfDatabaseSessionStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +17,12 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfDatabaseSessionStorage extends sfSessionStorage
+abstract class sfDatabaseSessionStorage extends \sfSessionStorage
 {
-    /** @var sfDatabase */
+    /** @var \sfDatabase */
     protected $db;
 
-    /** @var PDO */
+    /** @var \PDO */
     protected $con;
 
     /**
@@ -38,17 +38,17 @@ abstract class sfDatabaseSessionStorage extends sfSessionStorage
      *
      * @return bool|void
      *
-     * @throws sfInitializationException
+     * @throws \sfInitializationException
      *
-     * @see sfSessionStorage
+     * @see \sfSessionStorage
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
-        $options = array_merge(array(
+        $options = array_merge([
             'db_id_col' => 'sess_id',
             'db_data_col' => 'sess_data',
             'db_time_col' => 'sess_time',
-        ), $options);
+        ], $options);
 
         // disable auto_start
         $options['auto_start'] = false;
@@ -57,21 +57,21 @@ public function initialize($options = array())
         parent::initialize($options);
 
         if (!isset($this->options['db_table'])) {
-            throw new sfInitializationException('You must provide a "db_table" option to sfDatabaseSessionStorage.');
+            throw new \sfInitializationException('You must provide a "db_table" option to sfDatabaseSessionStorage.');
         }
 
         if (!isset($this->options['database'])) {
-            throw new sfInitializationException('You must provide a "database" option to sfDatabaseSessionStorage.');
+            throw new \sfInitializationException('You must provide a "database" option to sfDatabaseSessionStorage.');
         }
 
         // use this object as the session handler
         session_set_save_handler(
-            array($this, 'sessionOpen'),
-            array($this, 'sessionClose'),
-            array($this, 'sessionRead'),
-            array($this, 'sessionWrite'),
-            array($this, 'sessionDestroy'),
-            array($this, 'sessionGC')
+            [$this, 'sessionOpen'],
+            [$this, 'sessionClose'],
+            [$this, 'sessionRead'],
+            [$this, 'sessionWrite'],
+            [$this, 'sessionDestroy'],
+            [$this, 'sessionGC']
         );
 
         // start our session
@@ -97,18 +97,18 @@ public function sessionClose()
      *
      * @return bool true, if the session was opened, otherwise an exception is thrown
      *
-     * @throws DatabaseException If a connection with the database does not exist or cannot be created
+     * @throws \DatabaseException If a connection with the database does not exist or cannot be created
      */
     public function sessionOpen($path = null, $name = null)
     {
         // what database are we using?
-        /** @var sfDatabase $database */
+        /** @var \sfDatabase $database */
         $database = $this->options['database'];
 
         // get the database and connection
         $databaseClass = get_class($database);
         if ('sfPropelDatabase' == $databaseClass) {
-            $this->db = Propel::getConnection($database->getParameter('name'));
+            $this->db = \Propel::getConnection($database->getParameter('name'));
         } elseif ('sfDoctrineDatabase' == $databaseClass) {
             $this->db = $database->getConnection();
         } else {
@@ -118,7 +118,7 @@ public function sessionOpen($path = null, $name = null)
         $this->con = $database->getConnection();
 
         if (null === $this->db && null === $this->con) {
-            throw new sfDatabaseException('Database connection does not exist. Unable to open session.');
+            throw new \sfDatabaseException('Database connection does not exist. Unable to open session.');
         }
 
         return true;
@@ -131,7 +131,7 @@ public function sessionOpen($path = null, $name = null)
      *
      * @return bool true, if the session was destroyed, otherwise an exception is thrown
      *
-     * @throws DatabaseException If the session cannot be destroyed
+     * @throws \DatabaseException If the session cannot be destroyed
      */
     abstract public function sessionDestroy($id);
 
@@ -142,7 +142,7 @@ abstract public function sessionDestroy($id);
      *
      * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
      *
-     * @throws DatabaseException If any old sessions cannot be cleaned
+     * @throws \DatabaseException If any old sessions cannot be cleaned
      */
     abstract public function sessionGC($lifetime);
 
@@ -153,7 +153,7 @@ abstract public function sessionGC($lifetime);
      *
      * @return bool true, if the session was read, otherwise an exception is thrown
      *
-     * @throws DatabaseException If the session cannot be read
+     * @throws \DatabaseException If the session cannot be read
      */
     abstract public function sessionRead($id);
 
@@ -165,7 +165,7 @@ abstract public function sessionRead($id);
      *
      * @return bool true, if the session was written, otherwise an exception is thrown
      *
-     * @throws DatabaseException If the session data cannot be written
+     * @throws \DatabaseException If the session data cannot be written
      */
     abstract public function sessionWrite($id, $data);
 
diff --git a/lib/storage/sfMySQLSessionStorage.class.php b/lib/storage/sfMySQLSessionStorage.class.php
index d1ac7e0ae..2a33ab7ab 100644
--- a/lib/storage/sfMySQLSessionStorage.class.php
+++ b/lib/storage/sfMySQLSessionStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +20,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfMySQLSessionStorage extends sfDatabaseSessionStorage
+class sfMySQLSessionStorage extends \sfDatabaseSessionStorage
 {
     /**
      * Destroys a session.
@@ -29,7 +29,7 @@ class sfMySQLSessionStorage extends sfDatabaseSessionStorage
      *
      * @return bool true, if the session was destroyed, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If the session cannot be destroyed
+     * @throws \sfDatabaseException If the session cannot be destroyed
      */
     public function sessionDestroy($id)
     {
@@ -48,7 +48,7 @@ public function sessionDestroy($id)
         }
 
         // failed to destroy session
-        throw new sfDatabaseException(sprintf('%s cannot destroy session id "%s" (%s).', get_class($this), $id, $this->db_error()));
+        throw new \sfDatabaseException(sprintf('%s cannot destroy session id "%s" (%s).', get_class($this), $id, $this->db_error()));
     }
 
     /**
@@ -58,7 +58,7 @@ public function sessionDestroy($id)
      *
      * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If any old sessions cannot be cleaned
+     * @throws \sfDatabaseException If any old sessions cannot be cleaned
      */
     public function sessionGC($lifetime)
     {
@@ -71,7 +71,7 @@ public function sessionGC($lifetime)
         $sql = "DELETE FROM {$db_table} WHERE {$db_time_col} + {$lifetime} < UNIX_TIMESTAMP()";
 
         if (!$this->db_query($sql)) {
-            throw new sfDatabaseException(sprintf('%s cannot delete old sessions (%s).', get_class($this), $this->db_error()));
+            throw new \sfDatabaseException(sprintf('%s cannot delete old sessions (%s).', get_class($this), $this->db_error()));
         }
 
         return true;
@@ -84,7 +84,7 @@ public function sessionGC($lifetime)
      *
      * @return string The session data if the session was read or created, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If the session cannot be read
+     * @throws \sfDatabaseException If the session cannot be read
      */
     public function sessionRead($id)
     {
@@ -116,7 +116,7 @@ public function sessionRead($id)
         }
 
         // can't create record
-        throw new sfDatabaseException(sprintf('%s cannot create new record for id "%s" (%s).', get_class($this), $id, $this->db_error()));
+        throw new \sfDatabaseException(sprintf('%s cannot create new record for id "%s" (%s).', get_class($this), $id, $this->db_error()));
     }
 
     /**
@@ -127,7 +127,7 @@ public function sessionRead($id)
      *
      * @return bool true, if the session was written, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If the session data cannot be written
+     * @throws \sfDatabaseException If the session data cannot be written
      */
     public function sessionWrite($id, $data)
     {
@@ -149,7 +149,7 @@ public function sessionWrite($id, $data)
         }
 
         // failed to write session data
-        throw new sfDatabaseException(sprintf('%s cannot write session data for id "%s" (%s).', get_class($this), $id, $this->db_error()));
+        throw new \sfDatabaseException(sprintf('%s cannot write session data for id "%s" (%s).', get_class($this), $id, $this->db_error()));
     }
 
     /**
diff --git a/lib/storage/sfMySQLiSessionStorage.class.php b/lib/storage/sfMySQLiSessionStorage.class.php
index ebe34290c..9d22d9d45 100644
--- a/lib/storage/sfMySQLiSessionStorage.class.php
+++ b/lib/storage/sfMySQLiSessionStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,7 +21,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfMySQLiSessionStorage extends sfMySQLSessionStorage
+class sfMySQLiSessionStorage extends \sfMySQLSessionStorage
 {
     /**
      * Execute an SQL Query.
diff --git a/lib/storage/sfNoStorage.class.php b/lib/storage/sfNoStorage.class.php
index 0b65a6626..e609bbfaf 100644
--- a/lib/storage/sfNoStorage.class.php
+++ b/lib/storage/sfNoStorage.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +21,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfNoStorage extends sfStorage
+class sfNoStorage extends \sfStorage
 {
     /**
      * Reads data from this storage.
@@ -31,7 +32,7 @@ class sfNoStorage extends sfStorage
      *
      * @return mixed Data associated with the key
      *
-     * @throws sfStorageException If an error occurs while reading data from this storage
+     * @throws \sfStorageException If an error occurs while reading data from this storage
      */
     public function read($key)
     {
@@ -47,7 +48,7 @@ public function read($key)
      *
      * @return mixed Data associated with the key
      *
-     * @throws sfStorageException If an error occurs while removing data from this storage
+     * @throws \sfStorageException If an error occurs while removing data from this storage
      */
     public function remove($key)
     {
@@ -62,7 +63,7 @@ public function remove($key)
      * @param string $key  A unique key identifying your data
      * @param mixed  $data Data associated with your key
      *
-     * @throws sfStorageException If an error occurs while writing to this storage
+     * @throws \sfStorageException If an error occurs while writing to this storage
      */
     public function write($key, $data)
     {
@@ -83,7 +84,7 @@ public function regenerate($destroy = false)
     /**
      * Executes the shutdown procedure.
      *
-     * @throws sfStorageException If an error occurs while shutting down this storage
+     * @throws \sfStorageException If an error occurs while shutting down this storage
      */
     public function shutdown()
     {
diff --git a/lib/storage/sfPDOSessionStorage.class.php b/lib/storage/sfPDOSessionStorage.class.php
index fd69b1b08..ccc4352bd 100644
--- a/lib/storage/sfPDOSessionStorage.class.php
+++ b/lib/storage/sfPDOSessionStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004, 2005 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004, 2005 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +20,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfPDOSessionStorage extends sfDatabaseSessionStorage
+class sfPDOSessionStorage extends \sfDatabaseSessionStorage
 {
     /**
      * Destroys a session.
@@ -29,7 +29,7 @@ class sfPDOSessionStorage extends sfDatabaseSessionStorage
      *
      * @return bool true, if the session was destroyed, otherwise an exception is thrown
      *
-     * @throws DatabaseException If the session cannot be destroyed
+     * @throws \DatabaseException If the session cannot be destroyed
      */
     public function sessionDestroy($id)
     {
@@ -42,10 +42,10 @@ public function sessionDestroy($id)
 
         try {
             $stmt = $this->db->prepare($sql);
-            $stmt->bindParam(1, $id, PDO::PARAM_STR);
+            $stmt->bindParam(1, $id, \PDO::PARAM_STR);
             $stmt->execute();
-        } catch (PDOException $e) {
-            throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        } catch (\PDOException $e) {
+            throw new \sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
         }
 
         return true;
@@ -58,7 +58,7 @@ public function sessionDestroy($id)
      *
      * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
      *
-     * @throws DatabaseException If any old sessions cannot be cleaned
+     * @throws \DatabaseException If any old sessions cannot be cleaned
      */
     public function sessionGC($lifetime)
     {
@@ -71,8 +71,8 @@ public function sessionGC($lifetime)
 
         try {
             $this->db->query($sql);
-        } catch (PDOException $e) {
-            throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        } catch (\PDOException $e) {
+            throw new \sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
         }
 
         return true;
@@ -85,7 +85,7 @@ public function sessionGC($lifetime)
      *
      * @return string The session data if the session was read or created, otherwise an exception is thrown
      *
-     * @throws DatabaseException If the session cannot be read
+     * @throws \DatabaseException If the session cannot be read
      */
     public function sessionRead($id)
     {
@@ -99,12 +99,12 @@ public function sessionRead($id)
             $sql = 'SELECT '.$db_data_col.' FROM '.$db_table.' WHERE '.$db_id_col.'=?';
 
             $stmt = $this->db->prepare($sql);
-            $stmt->bindParam(1, $id, PDO::PARAM_STR, 255);
+            $stmt->bindParam(1, $id, \PDO::PARAM_STR, 255);
 
             $stmt->execute();
             // it is recommended to use fetchAll so that PDO can close the DB cursor
             // we anyway expect either no rows, or one row with one column. fetchColumn, seems to be buggy #4777
-            $sessionRows = $stmt->fetchAll(PDO::FETCH_NUM);
+            $sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
             if (1 == count($sessionRows)) {
                 return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
             }
@@ -113,14 +113,14 @@ public function sessionRead($id)
             $sql = 'INSERT INTO '.$db_table.'('.$db_id_col.', '.$db_data_col.', '.$db_time_col.') VALUES (?, ?, ?)';
 
             $stmt = $this->db->prepare($sql);
-            $stmt->bindParam(1, $id, PDO::PARAM_STR);
-            $stmt->bindValue(2, '', PDO::PARAM_STR);
-            $stmt->bindValue(3, time(), PDO::PARAM_INT);
+            $stmt->bindParam(1, $id, \PDO::PARAM_STR);
+            $stmt->bindValue(2, '', \PDO::PARAM_STR);
+            $stmt->bindValue(3, time(), \PDO::PARAM_INT);
             $stmt->execute();
 
             return '';
-        } catch (PDOException $e) {
-            throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        } catch (\PDOException $e) {
+            throw new \sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
         }
     }
 
@@ -132,7 +132,7 @@ public function sessionRead($id)
      *
      * @return bool true, if the session was written, otherwise an exception is thrown
      *
-     * @throws DatabaseException If the session data cannot be written
+     * @throws \DatabaseException If the session data cannot be written
      */
     public function sessionWrite($id, $data)
     {
@@ -146,11 +146,11 @@ public function sessionWrite($id, $data)
 
         try {
             $stmt = $this->db->prepare($sql);
-            $stmt->bindParam(1, $data, PDO::PARAM_STR);
-            $stmt->bindParam(2, $id, PDO::PARAM_STR);
+            $stmt->bindParam(1, $data, \PDO::PARAM_STR);
+            $stmt->bindParam(2, $id, \PDO::PARAM_STR);
             $stmt->execute();
-        } catch (PDOException $e) {
-            throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
+        } catch (\PDOException $e) {
+            throw new \sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
         }
 
         return true;
diff --git a/lib/storage/sfPostgreSQLSessionStorage.class.php b/lib/storage/sfPostgreSQLSessionStorage.class.php
index e387222c9..f13d9a255 100644
--- a/lib/storage/sfPostgreSQLSessionStorage.class.php
+++ b/lib/storage/sfPostgreSQLSessionStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfPostgreSQLSessionStorage extends sfDatabaseSessionStorage
+class sfPostgreSQLSessionStorage extends \sfDatabaseSessionStorage
 {
     /**
      * Destroys a session.
@@ -28,7 +28,7 @@ class sfPostgreSQLSessionStorage extends sfDatabaseSessionStorage
      *
      * @return bool true, if the session was destroyed, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If the session cannot be destroyed
+     * @throws \sfDatabaseException If the session cannot be destroyed
      */
     public function sessionDestroy($id)
     {
@@ -47,7 +47,7 @@ public function sessionDestroy($id)
         }
 
         // failed to destroy session
-        throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot destroy session id "%s".', $id));
+        throw new \sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot destroy session id "%s".', $id));
     }
 
     /**
@@ -57,7 +57,7 @@ public function sessionDestroy($id)
      *
      * @return bool true, if old sessions have been cleaned, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If any old sessions cannot be cleaned
+     * @throws \sfDatabaseException If any old sessions cannot be cleaned
      */
     public function sessionGC($lifetime)
     {
@@ -69,7 +69,7 @@ public function sessionGC($lifetime)
         $sql = 'DELETE FROM '.$db_table.' WHERE '.$db_time_col.' < '.(time() - $lifetime);
 
         if (!@pg_query($this->db, $sql)) {
-            throw new sfDatabaseException('sfPostgreSQLSessionStorage cannot delete old sessions.');
+            throw new \sfDatabaseException('sfPostgreSQLSessionStorage cannot delete old sessions.');
         }
 
         return true;
@@ -82,7 +82,7 @@ public function sessionGC($lifetime)
      *
      * @return string The session data if the session was read or created, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If the session cannot be read
+     * @throws \sfDatabaseException If the session cannot be read
      */
     public function sessionRead($id)
     {
@@ -115,7 +115,7 @@ public function sessionRead($id)
         }
 
         // can't create record
-        throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot create new record for id "%s".', $id));
+        throw new \sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot create new record for id "%s".', $id));
     }
 
     /**
@@ -126,7 +126,7 @@ public function sessionRead($id)
      *
      * @return bool true, if the session was written, otherwise an exception is thrown
      *
-     * @throws sfDatabaseException If the session data cannot be written
+     * @throws \sfDatabaseException If the session data cannot be written
      */
     public function sessionWrite($id, $data)
     {
@@ -148,6 +148,6 @@ public function sessionWrite($id, $data)
         }
 
         // failed to write session data
-        throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot write session data for id "%s".', $id));
+        throw new \sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot write session data for id "%s".', $id));
     }
 }
diff --git a/lib/storage/sfSessionStorage.class.php b/lib/storage/sfSessionStorage.class.php
index ebd669c3e..b1e2d9661 100644
--- a/lib/storage/sfSessionStorage.class.php
+++ b/lib/storage/sfSessionStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,7 +22,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfSessionStorage extends sfStorage
+class sfSessionStorage extends \sfStorage
 {
     protected static $sessionIdRegenerated = false;
     protected static $sessionStarted = false;
@@ -43,13 +43,13 @@ class sfSessionStorage extends sfStorage
      *
      * @param array $options An associative array of options
      *
-     * @see sfStorage
+     * @see \sfStorage
      */
     public function initialize($options = null)
     {
         $cookieDefaults = session_get_cookie_params();
 
-        $options = array_merge(array(
+        $options = array_merge([
             'session_name' => 'symfony',
             'session_id' => null,
             'auto_start' => true,
@@ -60,7 +60,7 @@ public function initialize($options = null)
             'session_cookie_httponly' => isset($cookieDefaults['httponly']) ? $cookieDefaults['httponly'] : false,
             'session_cache_limiter' => null,
             'gc_maxlifetime' => 1800,
-        ), $options);
+        ], $options);
 
         // initialize parent
         parent::initialize($options);
diff --git a/lib/storage/sfSessionTestStorage.class.php b/lib/storage/sfSessionTestStorage.class.php
index 5f3979bc2..8548e2839 100644
--- a/lib/storage/sfSessionTestStorage.class.php
+++ b/lib/storage/sfSessionTestStorage.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfSessionTestStorage extends sfStorage
+class sfSessionTestStorage extends \sfStorage
 {
     protected $sessionId;
-    protected $sessionData = array();
+    protected $sessionData = [];
 
     /**
      * Available options:.
@@ -28,17 +29,17 @@ class sfSessionTestStorage extends sfStorage
      *
      * @param array $options An associative array of options
      *
-     * @see sfStorage
+     * @see \sfStorage
      */
     public function initialize($options = null)
     {
         if (!isset($options['session_path'])) {
-            throw new InvalidArgumentException('The "session_path" option is mandatory for the sfSessionTestStorage class.');
+            throw new \InvalidArgumentException('The "session_path" option is mandatory for the sfSessionTestStorage class.');
         }
 
-        $options = array_merge(array(
+        $options = array_merge([
             'session_id' => null,
-        ), $options);
+        ], $options);
 
         // initialize parent
         parent::initialize($options);
@@ -48,10 +49,10 @@ public function initialize($options = null)
         if ($this->sessionId) {
             // we read session data from temp file
             $file = $this->options['session_path'].DIRECTORY_SEPARATOR.$this->sessionId.'.session';
-            $this->sessionData = is_file($file) ? unserialize(file_get_contents($file)) : array();
+            $this->sessionData = is_file($file) ? unserialize(file_get_contents($file)) : [];
         } else {
             $this->sessionId = md5(uniqid(mt_rand(), true));
-            $this->sessionData = array();
+            $this->sessionData = [];
         }
     }
 
@@ -124,7 +125,7 @@ public function write($key, $data)
      */
     public function clear()
     {
-        sfToolkit::clearDirectory($this->options['session_path']);
+        \sfToolkit::clearDirectory($this->options['session_path']);
     }
 
     /**
@@ -153,7 +154,7 @@ public function shutdown()
             umask($current_umask);
             file_put_contents($sessionsDir.DIRECTORY_SEPARATOR.$this->sessionId.'.session', serialize($this->sessionData));
             $this->sessionId = '';
-            $this->sessionData = array();
+            $this->sessionData = [];
         }
     }
 }
diff --git a/lib/storage/sfStorage.class.php b/lib/storage/sfStorage.class.php
index 553b051b5..21d0fba73 100644
--- a/lib/storage/sfStorage.class.php
+++ b/lib/storage/sfStorage.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,7 +19,7 @@
  */
 abstract class sfStorage
 {
-    protected $options = array();
+    protected $options = [];
 
     /**
      * Class constructor.
@@ -28,12 +28,12 @@ abstract class sfStorage
      *
      * @param array $options
      */
-    public function __construct($options = array())
+    public function __construct($options = [])
     {
         $this->initialize($options);
 
         if ($this->options['auto_shutdown']) {
-            register_shutdown_function(array($this, 'shutdown'));
+            register_shutdown_function([$this, 'shutdown']);
         }
     }
 
@@ -46,13 +46,13 @@ public function __construct($options = array())
      *
      * @param array $options An associative array of options
      *
-     * @throws sfInitializationException If an error occurs while initializing this sfStorage
+     * @throws \sfInitializationException If an error occurs while initializing this sfStorage
      */
-    public function initialize($options = array())
+    public function initialize($options = [])
     {
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'auto_shutdown' => true,
-        ), $options);
+        ], $options);
     }
 
     /**
@@ -74,7 +74,7 @@ public function getOptions()
      *
      * @return mixed Data associated with the key
      *
-     * @throws sfStorageException If an error occurs while reading data from this storage
+     * @throws \sfStorageException If an error occurs while reading data from this storage
      */
     abstract public function read($key);
 
@@ -85,7 +85,7 @@ abstract public function read($key);
      *
      * @return bool True if session regenerated, false if error
      *
-     * @throws sfStorageException If an error occurs while regenerating this storage
+     * @throws \sfStorageException If an error occurs while regenerating this storage
      */
     abstract public function regenerate($destroy = false);
 
@@ -98,14 +98,14 @@ abstract public function regenerate($destroy = false);
      *
      * @return mixed Data associated with the key
      *
-     * @throws sfStorageException If an error occurs while removing data from this storage
+     * @throws \sfStorageException If an error occurs while removing data from this storage
      */
     abstract public function remove($key);
 
     /**
      * Executes the shutdown procedure.
      *
-     * @throws sfStorageException If an error occurs while shutting down this storage
+     * @throws \sfStorageException If an error occurs while shutting down this storage
      */
     abstract public function shutdown();
 
@@ -117,7 +117,7 @@ abstract public function shutdown();
      * @param string $key  A unique key identifying your data
      * @param mixed  $data Data associated with your key
      *
-     * @throws sfStorageException If an error occurs while writing to this storage
+     * @throws \sfStorageException If an error occurs while writing to this storage
      */
     abstract public function write($key, $data);
 }
diff --git a/lib/task/app/sfAppRoutesTask.class.php b/lib/task/app/sfAppRoutesTask.class.php
index af7113fae..f85099e38 100644
--- a/lib/task/app/sfAppRoutesTask.class.php
+++ b/lib/task/app/sfAppRoutesTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,19 +16,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfAppRoutesTask extends sfBaseTask
+class sfAppRoutesTask extends \sfBaseTask
 {
-    protected $routes = array();
+    protected $routes = [];
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('name', sfCommandArgument::OPTIONAL, 'A route name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('name', \sfCommandArgument::OPTIONAL, 'A route name'),
+        ]);
 
         $this->namespace = 'app';
         $this->name = 'routes';
@@ -41,9 +42,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->routes = $this->getRouting()->getRoutes();
 
@@ -86,7 +87,7 @@ protected function outputRoute($application, $name)
         $this->logSection('app', sprintf('Route "%s" for application "%s"', $name, $application));
 
         if (!isset($this->routes[$name])) {
-            throw new sfCommandException(sprintf('The route "%s" does not exist.', $name));
+            throw new \sfCommandException(sprintf('The route "%s" does not exist.', $name));
         }
 
         $route = $this->routes[$name];
diff --git a/lib/task/cache/sfCacheClearTask.class.php b/lib/task/cache/sfCacheClearTask.class.php
index af975e83a..260397b61 100644
--- a/lib/task/cache/sfCacheClearTask.class.php
+++ b/lib/task/cache/sfCacheClearTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,27 +16,27 @@
  *
  * @version    SVN: $Id$
  */
-class sfCacheClearTask extends sfBaseTask
+class sfCacheClearTask extends \sfBaseTask
 {
     protected $config;
 
-    public function getFactoriesConfiguration(sfApplicationConfiguration $appConfiguration)
+    public function getFactoriesConfiguration(\sfApplicationConfiguration $appConfiguration)
     {
         $app = $appConfiguration->getApplication();
         $env = $appConfiguration->getEnvironment();
 
         if (!isset($this->config[$app])) {
-            $this->config[$app] = array();
+            $this->config[$app] = [];
         }
 
         if (!isset($this->config[$app][$env])) {
-            $this->config[$app][$env] = sfFactoryConfigHandler::getConfiguration($appConfiguration->getConfigPaths('config/factories.yml'));
+            $this->config[$app][$env] = \sfFactoryConfigHandler::getConfiguration($appConfiguration->getConfigPaths('config/factories.yml'));
         }
 
         return $this->config[$app][$env];
     }
 
-    public function cleanCacheFromFactoryConfig($class, $parameters = array())
+    public function cleanCacheFromFactoryConfig($class, $parameters = [])
     {
         if ($class) {
             // the standard array with ['class'] and ['param'] can be passed as well
@@ -52,24 +53,24 @@ public function cleanCacheFromFactoryConfig($class, $parameters = array())
             try {
                 $cache = new $class($parameters);
                 $cache->clean();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->logSection('error', $e->getMessage(), 255, 'ERROR');
             }
         }
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('app', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_OPTIONAL, 'The environment', null),
-            new sfCommandOption('type', null, sfCommandOption::PARAMETER_OPTIONAL, 'The type', 'all'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('app', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The environment', null),
+            new \sfCommandOption('type', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The type', 'all'),
+        ]);
 
-        $this->aliases = array('cc');
+        $this->aliases = ['cc'];
         $this->namespace = 'cache';
         $this->name = 'clear';
         $this->briefDescription = 'Clears the cache';
@@ -105,45 +106,45 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        if (!sfConfig::get('sf_cache_dir') || !is_dir(sfConfig::get('sf_cache_dir'))) {
-            throw new sfException(sprintf('Cache directory "%s" does not exist.', sfConfig::get('sf_cache_dir')));
+        if (!\sfConfig::get('sf_cache_dir') || !is_dir(\sfConfig::get('sf_cache_dir'))) {
+            throw new \sfException(sprintf('Cache directory "%s" does not exist.', \sfConfig::get('sf_cache_dir')));
         }
 
         // finder to find directories (1 level) in a directory
-        $dirFinder = sfFinder::type('dir')->discard('.*')->maxdepth(0)->relative();
+        $dirFinder = \sfFinder::type('dir')->discard('.*')->maxdepth(0)->relative();
 
         // iterate through applications
-        $apps = null === $options['app'] ? $dirFinder->in(sfConfig::get('sf_apps_dir')) : array($options['app']);
+        $apps = null === $options['app'] ? $dirFinder->in(\sfConfig::get('sf_apps_dir')) : [$options['app']];
         foreach ($apps as $app) {
             $this->checkAppExists($app);
 
-            if (!is_dir(sfConfig::get('sf_cache_dir').'/'.$app)) {
+            if (!is_dir(\sfConfig::get('sf_cache_dir').'/'.$app)) {
                 continue;
             }
 
             // iterate through environments
-            $envs = null === $options['env'] ? $dirFinder->in(sfConfig::get('sf_cache_dir').'/'.$app) : array($options['env']);
+            $envs = null === $options['env'] ? $dirFinder->in(\sfConfig::get('sf_cache_dir').'/'.$app) : [$options['env']];
             foreach ($envs as $env) {
-                if (!is_dir(sfConfig::get('sf_cache_dir').'/'.$app.'/'.$env)) {
+                if (!is_dir(\sfConfig::get('sf_cache_dir').'/'.$app.'/'.$env)) {
                     continue;
                 }
 
                 $this->logSection('cache', sprintf('Clearing cache type "%s" for "%s" app and "%s" env', $options['type'], $app, $env));
 
-                $appConfiguration = ProjectConfiguration::getApplicationConfiguration($app, $env, true);
+                $appConfiguration = \ProjectConfiguration::getApplicationConfiguration($app, $env, true);
 
                 $this->lock($app, $env);
 
-                $event = $appConfiguration->getEventDispatcher()->notifyUntil(new sfEvent($this, 'task.cache.clear', array('app' => $appConfiguration, 'env' => $env, 'type' => $options['type'])));
+                $event = $appConfiguration->getEventDispatcher()->notifyUntil(new \sfEvent($this, 'task.cache.clear', ['app' => $appConfiguration, 'env' => $env, 'type' => $options['type']]));
                 if (!$event->isProcessed()) {
                     // default cleaning process
                     $method = $this->getClearCacheMethod($options['type']);
                     if (!method_exists($this, $method)) {
-                        throw new InvalidArgumentException(sprintf('Do not know how to remove cache for type "%s".', $options['type']));
+                        throw new \InvalidArgumentException(sprintf('Do not know how to remove cache for type "%s".', $options['type']));
                     }
                     $this->{$method}($appConfiguration);
                 }
@@ -154,7 +155,7 @@ protected function execute($arguments = array(), $options = array())
 
         // clear global cache
         if (null === $options['app'] && 'all' == $options['type']) {
-            $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in(sfConfig::get('sf_cache_dir')));
+            $this->getFilesystem()->remove(\sfFinder::type('file')->discard('.*')->in(\sfConfig::get('sf_cache_dir')));
         }
     }
 
@@ -163,7 +164,7 @@ protected function getClearCacheMethod($type)
         return sprintf('clear%sCache', ucfirst($type));
     }
 
-    protected function clearAllCache(sfApplicationConfiguration $appConfiguration)
+    protected function clearAllCache(\sfApplicationConfiguration $appConfiguration)
     {
         $this->clearI18NCache($appConfiguration);
         $this->clearRoutingCache($appConfiguration);
@@ -172,17 +173,17 @@ protected function clearAllCache(sfApplicationConfiguration $appConfiguration)
         $this->clearConfigCache($appConfiguration);
     }
 
-    protected function clearConfigCache(sfApplicationConfiguration $appConfiguration)
+    protected function clearConfigCache(\sfApplicationConfiguration $appConfiguration)
     {
-        $subDir = sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/config';
+        $subDir = \sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/config';
 
         if (is_dir($subDir)) {
             // remove cache files
-            $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
+            $this->getFilesystem()->remove(\sfFinder::type('file')->discard('.*')->in($subDir));
         }
     }
 
-    protected function clearI18NCache(sfApplicationConfiguration $appConfiguration)
+    protected function clearI18NCache(\sfApplicationConfiguration $appConfiguration)
     {
         $config = $this->getFactoriesConfiguration($appConfiguration);
 
@@ -191,7 +192,7 @@ protected function clearI18NCache(sfApplicationConfiguration $appConfiguration)
         }
     }
 
-    protected function clearRoutingCache(sfApplicationConfiguration $appConfiguration)
+    protected function clearRoutingCache(\sfApplicationConfiguration $appConfiguration)
     {
         $config = $this->getFactoriesConfiguration($appConfiguration);
 
@@ -200,7 +201,7 @@ protected function clearRoutingCache(sfApplicationConfiguration $appConfiguratio
         }
     }
 
-    protected function clearTemplateCache(sfApplicationConfiguration $appConfiguration)
+    protected function clearTemplateCache(\sfApplicationConfiguration $appConfiguration)
     {
         $config = $this->getFactoriesConfiguration($appConfiguration);
 
@@ -209,13 +210,13 @@ protected function clearTemplateCache(sfApplicationConfiguration $appConfigurati
         }
     }
 
-    protected function clearModuleCache(sfApplicationConfiguration $appConfiguration)
+    protected function clearModuleCache(\sfApplicationConfiguration $appConfiguration)
     {
-        $subDir = sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/modules';
+        $subDir = \sfConfig::get('sf_cache_dir').'/'.$appConfiguration->getApplication().'/'.$appConfiguration->getEnvironment().'/modules';
 
         if (is_dir($subDir)) {
             // remove cache files
-            $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
+            $this->getFilesystem()->remove(\sfFinder::type('file')->discard('.*')->in($subDir));
         }
     }
 
@@ -236,6 +237,6 @@ protected function unlock($app, $env)
 
     protected function getLockFile($app, $env)
     {
-        return sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'-cli.lck';
+        return \sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'-cli.lck';
     }
 }
diff --git a/lib/task/configure/sfConfigureAuthorTask.class.php b/lib/task/configure/sfConfigureAuthorTask.class.php
index fc239867c..da1b66eff 100644
--- a/lib/task/configure/sfConfigureAuthorTask.class.php
+++ b/lib/task/configure/sfConfigureAuthorTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,16 +16,16 @@
  *
  * @version    SVN: $Id$
  */
-class sfConfigureAuthorTask extends sfBaseTask
+class sfConfigureAuthorTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('author', sfCommandArgument::REQUIRED, 'The project author'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('author', \sfCommandArgument::REQUIRED, 'The project author'),
+        ]);
 
         $this->namespace = 'configure';
         $this->name = 'author';
@@ -43,15 +44,15 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $file = sfConfig::get('sf_config_dir').'/properties.ini';
+        $file = \sfConfig::get('sf_config_dir').'/properties.ini';
         $content = parse_ini_file($file, true);
 
         if (!isset($content['symfony'])) {
-            $content['symfony'] = array();
+            $content['symfony'] = [];
         }
 
         $content['symfony']['author'] = $arguments['author'];
diff --git a/lib/task/generator/sfGenerateAppTask.class.php b/lib/task/generator/sfGenerateAppTask.class.php
index 68e5eee89..5d652553f 100644
--- a/lib/task/generator/sfGenerateAppTask.class.php
+++ b/lib/task/generator/sfGenerateAppTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,21 +18,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfGenerateAppTask extends sfGeneratorBaseTask
+class sfGenerateAppTask extends \sfGeneratorBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('app', sfCommandArgument::REQUIRED, 'The application name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('app', \sfCommandArgument::REQUIRED, 'The application name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('escaping-strategy', null, sfCommandOption::PARAMETER_REQUIRED, 'Output escaping strategy', true),
-            new sfCommandOption('csrf-secret', null, sfCommandOption::PARAMETER_REQUIRED, 'Secret to use for CSRF protection', true),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('escaping-strategy', null, \sfCommandOption::PARAMETER_REQUIRED, 'Output escaping strategy', true),
+            new \sfCommandOption('csrf-secret', null, \sfCommandOption::PARAMETER_REQUIRED, 'Secret to use for CSRF protection', true),
+        ]);
 
         $this->namespace = 'generate';
         $this->name = 'app';
@@ -75,36 +76,36 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $app = $arguments['app'];
 
         // Validate the application name
         if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $app)) {
-            throw new sfCommandException(sprintf('The application name "%s" is invalid.', $app));
+            throw new \sfCommandException(sprintf('The application name "%s" is invalid.', $app));
         }
 
-        $appDir = sfConfig::get('sf_apps_dir').'/'.$app;
+        $appDir = \sfConfig::get('sf_apps_dir').'/'.$app;
 
         if (is_dir($appDir)) {
-            throw new sfCommandException(sprintf('The application "%s" already exists.', $appDir));
+            throw new \sfCommandException(sprintf('The application "%s" already exists.', $appDir));
         }
 
-        if (is_readable(sfConfig::get('sf_data_dir').'/skeleton/app')) {
-            $skeletonDir = sfConfig::get('sf_data_dir').'/skeleton/app';
+        if (is_readable(\sfConfig::get('sf_data_dir').'/skeleton/app')) {
+            $skeletonDir = \sfConfig::get('sf_data_dir').'/skeleton/app';
         } else {
             $skeletonDir = __DIR__.'/skeleton/app';
         }
 
         // Create basic application structure
-        $finder = sfFinder::type('any')->discard('.sf');
+        $finder = \sfFinder::type('any')->discard('.sf');
         $this->getFilesystem()->mirror($skeletonDir.'/app', $appDir, $finder);
 
         // Create $app.php or index.php if it is our first app
         $indexName = 'index';
-        $firstApp = !file_exists(sfConfig::get('sf_web_dir').'/index.php');
+        $firstApp = !file_exists(\sfConfig::get('sf_web_dir').'/index.php');
         if (!$firstApp) {
             $indexName = $app;
         }
@@ -114,25 +115,25 @@ protected function execute($arguments = array(), $options = array())
         }
 
         // Set no_script_name value in settings.yml for production environment
-        $finder = sfFinder::type('file')->name('settings.yml');
-        $this->getFilesystem()->replaceTokens($finder->in($appDir.'/config'), '##', '##', array(
+        $finder = \sfFinder::type('file')->name('settings.yml');
+        $this->getFilesystem()->replaceTokens($finder->in($appDir.'/config'), '##', '##', [
             'NO_SCRIPT_NAME' => $firstApp ? 'true' : 'false',
-            'CSRF_SECRET' => sfYamlInline::dump(sfYamlInline::parseScalar($options['csrf-secret'])),
-            'ESCAPING_STRATEGY' => sfYamlInline::dump((bool) sfYamlInline::parseScalar($options['escaping-strategy'])),
-            'USE_DATABASE' => sfConfig::has('sf_orm') ? 'true' : 'false',
-        ));
+            'CSRF_SECRET' => \sfYamlInline::dump(\sfYamlInline::parseScalar($options['csrf-secret'])),
+            'ESCAPING_STRATEGY' => \sfYamlInline::dump((bool) \sfYamlInline::parseScalar($options['escaping-strategy'])),
+            'USE_DATABASE' => \sfConfig::has('sf_orm') ? 'true' : 'false',
+        ]);
 
-        $this->getFilesystem()->copy($skeletonDir.'/web/index.php', sfConfig::get('sf_web_dir').'/'.$indexName.'.php');
-        $this->getFilesystem()->copy($skeletonDir.'/web/index.php', sfConfig::get('sf_web_dir').'/'.$app.'_dev.php');
+        $this->getFilesystem()->copy($skeletonDir.'/web/index.php', \sfConfig::get('sf_web_dir').'/'.$indexName.'.php');
+        $this->getFilesystem()->copy($skeletonDir.'/web/index.php', \sfConfig::get('sf_web_dir').'/'.$app.'_dev.php');
 
-        $this->getFilesystem()->replaceTokens(sfConfig::get('sf_web_dir').'/'.$indexName.'.php', '##', '##', array(
+        $this->getFilesystem()->replaceTokens(\sfConfig::get('sf_web_dir').'/'.$indexName.'.php', '##', '##', [
             'APP_NAME' => $app,
             'ENVIRONMENT' => 'prod',
             'IS_DEBUG' => 'false',
             'IP_CHECK' => '',
-        ));
+        ]);
 
-        $this->getFilesystem()->replaceTokens(sfConfig::get('sf_web_dir').'/'.$app.'_dev.php', '##', '##', array(
+        $this->getFilesystem()->replaceTokens(\sfConfig::get('sf_web_dir').'/'.$app.'_dev.php', '##', '##', [
             'APP_NAME' => $app,
             'ENVIRONMENT' => 'dev',
             'IS_DEBUG' => 'true',
@@ -142,18 +143,18 @@ protected function execute($arguments = array(), $options = array())
                              '{'.PHP_EOL.
                              '  die(\'You are not allowed to access this file. Check \'.basename(__FILE__).\' for more information.\');'.PHP_EOL.
                              '}'.PHP_EOL,
-        ));
+        ]);
 
         $this->getFilesystem()->rename($appDir.'/config/ApplicationConfiguration.class.php', $appDir.'/config/'.$app.'Configuration.class.php');
 
-        $this->getFilesystem()->replaceTokens($appDir.'/config/'.$app.'Configuration.class.php', '##', '##', array('APP_NAME' => $app));
+        $this->getFilesystem()->replaceTokens($appDir.'/config/'.$app.'Configuration.class.php', '##', '##', ['APP_NAME' => $app]);
 
-        $fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
+        $fixPerms = new \sfProjectPermissionsTask($this->dispatcher, $this->formatter);
         $fixPerms->setCommandApplication($this->commandApplication);
         $fixPerms->setConfiguration($this->configuration);
         $fixPerms->run();
 
         // Create test dir
-        $this->getFilesystem()->mkdirs(sfConfig::get('sf_test_dir').'/functional/'.$app);
+        $this->getFilesystem()->mkdirs(\sfConfig::get('sf_test_dir').'/functional/'.$app);
     }
 }
diff --git a/lib/task/generator/sfGenerateModuleTask.class.php b/lib/task/generator/sfGenerateModuleTask.class.php
index c40899f15..7484d8718 100644
--- a/lib/task/generator/sfGenerateModuleTask.class.php
+++ b/lib/task/generator/sfGenerateModuleTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,17 +18,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfGenerateModuleTask extends sfGeneratorBaseTask
+class sfGenerateModuleTask extends \sfGeneratorBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('module', sfCommandArgument::REQUIRED, 'The module name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('module', \sfCommandArgument::REQUIRED, 'The module name'),
+        ]);
 
         $this->namespace = 'generate';
         $this->name = 'module';
@@ -60,51 +61,51 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $app = $arguments['application'];
         $module = $arguments['module'];
 
         // Validate the module name
         if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $module)) {
-            throw new sfCommandException(sprintf('The module name "%s" is invalid.', $module));
+            throw new \sfCommandException(sprintf('The module name "%s" is invalid.', $module));
         }
 
-        $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$module;
+        $moduleDir = \sfConfig::get('sf_app_module_dir').'/'.$module;
 
         if (is_dir($moduleDir)) {
-            throw new sfCommandException(sprintf('The module "%s" already exists in the "%s" application.', $moduleDir, $app));
+            throw new \sfCommandException(sprintf('The module "%s" already exists in the "%s" application.', $moduleDir, $app));
         }
 
-        $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
+        $properties = parse_ini_file(\sfConfig::get('sf_config_dir').'/properties.ini', true);
 
-        $constants = array(
+        $constants = [
             'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
             'APP_NAME' => $app,
             'MODULE_NAME' => $module,
             'AUTHOR_NAME' => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
-        );
+        ];
 
-        if (is_readable(sfConfig::get('sf_data_dir').'/skeleton/module')) {
-            $skeletonDir = sfConfig::get('sf_data_dir').'/skeleton/module';
+        if (is_readable(\sfConfig::get('sf_data_dir').'/skeleton/module')) {
+            $skeletonDir = \sfConfig::get('sf_data_dir').'/skeleton/module';
         } else {
             $skeletonDir = __DIR__.'/skeleton/module';
         }
 
         // create basic application structure
-        $finder = sfFinder::type('any')->discard('.sf');
+        $finder = \sfFinder::type('any')->discard('.sf');
         $this->getFilesystem()->mirror($skeletonDir.'/module', $moduleDir, $finder);
 
         // create basic test
-        $this->getFilesystem()->copy($skeletonDir.'/test/actionsTest.php', sfConfig::get('sf_test_dir').'/functional/'.$app.'/'.$module.'ActionsTest.php');
+        $this->getFilesystem()->copy($skeletonDir.'/test/actionsTest.php', \sfConfig::get('sf_test_dir').'/functional/'.$app.'/'.$module.'ActionsTest.php');
 
         // customize test file
-        $this->getFilesystem()->replaceTokens(sfConfig::get('sf_test_dir').'/functional/'.$app.DIRECTORY_SEPARATOR.$module.'ActionsTest.php', '##', '##', $constants);
+        $this->getFilesystem()->replaceTokens(\sfConfig::get('sf_test_dir').'/functional/'.$app.DIRECTORY_SEPARATOR.$module.'ActionsTest.php', '##', '##', $constants);
 
         // customize php and yml files
-        $finder = sfFinder::type('file')->name('*.php', '*.yml');
+        $finder = \sfFinder::type('file')->name('*.php', '*.yml');
         $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $constants);
     }
 }
diff --git a/lib/task/generator/sfGenerateProjectTask.class.php b/lib/task/generator/sfGenerateProjectTask.class.php
index 28d2eeeb5..77ffd69fa 100755
--- a/lib/task/generator/sfGenerateProjectTask.class.php
+++ b/lib/task/generator/sfGenerateProjectTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,12 +18,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfGenerateProjectTask extends sfGeneratorBaseTask
+class sfGenerateProjectTask extends \sfGeneratorBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function doRun(sfCommandManager $commandManager, $options)
+    protected function doRun(\sfCommandManager $commandManager, $options)
     {
         $this->process($commandManager, $options);
 
@@ -30,19 +31,19 @@ protected function doRun(sfCommandManager $commandManager, $options)
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The project name'),
-            new sfCommandArgument('author', sfCommandArgument::OPTIONAL, 'The project author', 'Your name here'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED, 'The project name'),
+            new \sfCommandArgument('author', \sfCommandArgument::OPTIONAL, 'The project author', 'Your name here'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('orm', null, sfCommandOption::PARAMETER_REQUIRED, 'The ORM to use by default', 'Doctrine'),
-            new sfCommandOption('installer', null, sfCommandOption::PARAMETER_REQUIRED, 'An installer script to execute', null),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('orm', null, \sfCommandOption::PARAMETER_REQUIRED, 'The ORM to use by default', 'Doctrine'),
+            new \sfCommandOption('installer', null, \sfCommandOption::PARAMETER_REQUIRED, 'An installer script to execute', null),
+        ]);
 
         $this->namespace = 'generate';
         $this->name = 'project';
@@ -77,20 +78,20 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         if (file_exists('symfony')) {
-            throw new sfCommandException(sprintf('A symfony project already exists in this directory (%s).', getcwd()));
+            throw new \sfCommandException(sprintf('A symfony project already exists in this directory (%s).', getcwd()));
         }
 
-        if (!in_array(strtolower($options['orm']), array('doctrine', 'none'))) {
-            throw new InvalidArgumentException(sprintf('Invalid ORM name "%s".', $options['orm']));
+        if (!in_array(strtolower($options['orm']), ['doctrine', 'none'])) {
+            throw new \InvalidArgumentException(sprintf('Invalid ORM name "%s".', $options['orm']));
         }
 
         if ($options['installer'] && $this->commandApplication && !file_exists($options['installer'])) {
-            throw new InvalidArgumentException(sprintf('The installer "%s" does not exist.', $options['installer']));
+            throw new \InvalidArgumentException(sprintf('The installer "%s" does not exist.', $options['installer']));
         }
 
         // clean orm option
@@ -103,18 +104,18 @@ protected function execute($arguments = array(), $options = array())
         $this->installDir(__DIR__.'/skeleton/project');
 
         // update ProjectConfiguration class (use a relative path when the symfony core is nested within the project)
-        $symfonyCoreAutoload = 0 === strpos(sfConfig::get('sf_symfony_lib_dir'), sfConfig::get('sf_root_dir')) ?
-          sprintf('__DIR__.\'/..%s/autoload/sfCoreAutoload.class.php\'', str_replace(sfConfig::get('sf_root_dir'), '', sfConfig::get('sf_symfony_lib_dir'))) :
-          var_export(sfConfig::get('sf_symfony_lib_dir').'/autoload/sfCoreAutoload.class.php', true);
+        $symfonyCoreAutoload =   str_starts_with(\sfConfig::get('sf_symfony_lib_dir'), \sfConfig::get('sf_root_dir')) ?
+          sprintf('__DIR__.\'/..%s/autoload/sfCoreAutoload.class.php\'', str_replace(\sfConfig::get('sf_root_dir'), '', \sfConfig::get('sf_symfony_lib_dir'))) :
+          var_export(\sfConfig::get('sf_symfony_lib_dir').'/autoload/sfCoreAutoload.class.php', true);
 
-        $this->replaceTokens(array(sfConfig::get('sf_config_dir')), array('SYMFONY_CORE_AUTOLOAD' => str_replace('\\', '/', $symfonyCoreAutoload)));
+        $this->replaceTokens([\sfConfig::get('sf_config_dir')], ['SYMFONY_CORE_AUTOLOAD' => str_replace('\\', '/', $symfonyCoreAutoload)]);
 
-        $this->tokens = array(
+        $this->tokens = [
             'ORM' => $this->options['orm'],
             'PROJECT_NAME' => $this->arguments['name'],
             'AUTHOR_NAME' => $this->arguments['author'],
-            'PROJECT_DIR' => sfConfig::get('sf_root_dir'),
-        );
+            'PROJECT_DIR' => \sfConfig::get('sf_root_dir'),
+        ];
 
         $this->replaceTokens();
 
@@ -133,7 +134,7 @@ protected function execute($arguments = array(), $options = array())
         }
 
         // fix permission for common directories
-        $fixPerms = new sfProjectPermissionsTask($this->dispatcher, $this->formatter);
+        $fixPerms = new \sfProjectPermissionsTask($this->dispatcher, $this->formatter);
         $fixPerms->setCommandApplication($this->commandApplication);
         $fixPerms->setConfiguration($this->configuration);
         $fixPerms->run();
diff --git a/lib/task/generator/sfGenerateTaskTask.class.php b/lib/task/generator/sfGenerateTaskTask.class.php
index 030c53fd1..89e10f176 100644
--- a/lib/task/generator/sfGenerateTaskTask.class.php
+++ b/lib/task/generator/sfGenerateTaskTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,22 +14,22 @@
  *
  * @author     Francois Zaninotto <francois.zaninotto@symfony-project.com>
  */
-class sfGenerateTaskTask extends sfBaseTask
+class sfGenerateTaskTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('task_name', sfCommandArgument::REQUIRED, 'The task name (can contain namespace)'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('task_name', \sfCommandArgument::REQUIRED, 'The task name (can contain namespace)'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('dir', null, sfCommandOption::PARAMETER_REQUIRED, 'The directory to create the task in', 'lib/task'),
-            new sfCommandOption('use-database', null, sfCommandOption::PARAMETER_REQUIRED, 'Whether the task needs model initialization to access database', sfConfig::get('sf_orm')),
-            new sfCommandOption('brief-description', null, sfCommandOption::PARAMETER_REQUIRED, 'A brief task description (appears in task list)'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('dir', null, \sfCommandOption::PARAMETER_REQUIRED, 'The directory to create the task in', 'lib/task'),
+            new \sfCommandOption('use-database', null, \sfCommandOption::PARAMETER_REQUIRED, 'Whether the task needs model initialization to access database', \sfConfig::get('sf_orm')),
+            new \sfCommandOption('brief-description', null, \sfCommandOption::PARAMETER_REQUIRED, 'A brief task description (appears in task list)'),
+        ]);
 
         $this->namespace = 'generate';
         $this->name = 'task';
@@ -66,9 +67,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $taskName = $arguments['task_name'];
         $taskNameComponents = explode(':', $taskName);
@@ -78,7 +79,7 @@ protected function execute($arguments = array(), $options = array())
 
         // Validate the class name
         if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $taskClassName)) {
-            throw new sfCommandException(sprintf('The task class name "%s" is invalid.', $taskClassName));
+            throw new \sfCommandException(sprintf('The task class name "%s" is invalid.', $taskClassName));
         }
 
         $briefDescription = $options['brief-description'];
@@ -89,8 +90,8 @@ protected function execute($arguments = array(), $options = array())
   [php symfony {$taskName}|INFO]
 HED;
 
-        $useDatabase = sfToolkit::literalize($options['use-database']);
-        $defaultConnection = is_string($useDatabase) ? $useDatabase : sfConfig::get('sf_orm');
+        $useDatabase = \sfToolkit::literalize($options['use-database']);
+        $defaultConnection = is_string($useDatabase) ? $useDatabase : \sfConfig::get('sf_orm');
 
         if ($useDatabase) {
             $content = <<<HED
@@ -167,13 +168,13 @@ protected function execute(\$arguments = array(), \$options = array())
         }
 
         // check that the task directory exists and that the task file doesn't exist
-        if (!is_readable(sfConfig::get('sf_root_dir').'/'.$options['dir'])) {
+        if (!is_readable(\sfConfig::get('sf_root_dir').'/'.$options['dir'])) {
             $this->getFilesystem()->mkdirs($options['dir']);
         }
 
-        $taskFile = sfConfig::get('sf_root_dir').'/'.$options['dir'].'/'.$taskClassName.'.class.php';
+        $taskFile = \sfConfig::get('sf_root_dir').'/'.$options['dir'].'/'.$taskClassName.'.class.php';
         if (is_readable($taskFile)) {
-            throw new sfCommandException(sprintf('A "%s" task already exists in "%s".', $taskName, $taskFile));
+            throw new \sfCommandException(sprintf('A "%s" task already exists in "%s".', $taskName, $taskFile));
         }
 
         $this->logSection('task', sprintf('Creating "%s" task file', $taskFile));
diff --git a/lib/task/generator/sfGeneratorBaseTask.class.php b/lib/task/generator/sfGeneratorBaseTask.class.php
index 6324a094b..ae6c90b21 100644
--- a/lib/task/generator/sfGeneratorBaseTask.class.php
+++ b/lib/task/generator/sfGeneratorBaseTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfGeneratorBaseTask extends sfBaseTask
+abstract class sfGeneratorBaseTask extends \sfBaseTask
 {
 }
diff --git a/lib/task/help/sfHelpTask.class.php b/lib/task/help/sfHelpTask.class.php
index e04b3d878..8d4eb4b88 100644
--- a/lib/task/help/sfHelpTask.class.php
+++ b/lib/task/help/sfHelpTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,20 +16,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfHelpTask extends sfCommandApplicationTask
+class sfHelpTask extends \sfCommandApplicationTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('task_name', sfCommandArgument::OPTIONAL, 'The task name', 'help'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('task_name', \sfCommandArgument::OPTIONAL, 'The task name', 'help'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_NONE, 'To output help as XML'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('xml', null, \sfCommandOption::PARAMETER_NONE, 'To output help as XML'),
+        ]);
 
         $this->briefDescription = 'Displays help for a task';
 
@@ -44,12 +45,12 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         if (!isset($this->commandApplication)) {
-            throw new sfCommandException('You can only launch this task from the command line.');
+            throw new \sfCommandException('You can only launch this task from the command line.');
         }
 
         $task = $this->commandApplication->getTask($arguments['task_name']);
@@ -61,9 +62,9 @@ protected function execute($arguments = array(), $options = array())
         }
     }
 
-    protected function outputAsText(sfTask $task)
+    protected function outputAsText(\sfTask $task)
     {
-        $messages = array();
+        $messages = [];
 
         $messages[] = $this->formatter->format('Usage:', 'COMMENT');
         $messages[] = $this->formatter->format(sprintf(' '.$task->getSynopsis(), null === $this->commandApplication ? '' : $this->commandApplication->getName()))."\n";
@@ -113,7 +114,7 @@ protected function outputAsText(sfTask $task)
         $this->log($messages);
     }
 
-    protected function outputAsXml(sfTask $task)
+    protected function outputAsXml(\sfTask $task)
     {
         echo $task->asXml();
     }
diff --git a/lib/task/help/sfListTask.class.php b/lib/task/help/sfListTask.class.php
index 132a7d696..3e4978292 100644
--- a/lib/task/help/sfListTask.class.php
+++ b/lib/task/help/sfListTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,20 +16,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfListTask extends sfCommandApplicationTask
+class sfListTask extends \sfCommandApplicationTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('namespace', sfCommandArgument::OPTIONAL, 'The namespace name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('namespace', \sfCommandArgument::OPTIONAL, 'The namespace name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_NONE, 'To output help as XML'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('xml', null, \sfCommandOption::PARAMETER_NONE, 'To output help as XML'),
+        ]);
 
         $this->briefDescription = 'Lists tasks';
 
@@ -48,11 +49,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $tasks = array();
+        $tasks = [];
         foreach ($this->commandApplication->getTasks() as $name => $task) {
             if ($arguments['namespace'] && $arguments['namespace'] != $task->getNamespace()) {
                 continue;
@@ -88,7 +89,7 @@ protected function outputAsText($namespace, $tasks)
         }
         $width += strlen($this->formatter->format('  ', 'INFO'));
 
-        $messages = array();
+        $messages = [];
         if ($namespace) {
             $messages[] = $this->formatter->format(sprintf('Available tasks for the "%s" namespace:', $namespace), 'COMMENT');
         } else {
@@ -114,7 +115,7 @@ protected function outputAsText($namespace, $tasks)
 
     protected function outputAsXml($namespace, $tasks)
     {
-        $dom = new DOMDocument('1.0', 'UTF-8');
+        $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->formatOutput = true;
         $dom->appendChild($symfonyXML = $dom->createElement('symfony'));
 
@@ -129,7 +130,7 @@ protected function outputAsXml($namespace, $tasks)
         // display tasks
         ksort($tasks);
         $currentNamespace = 'foobar';
-        $namespaceArrayXML = array();
+        $namespaceArrayXML = [];
         foreach ($tasks as $name => $task) {
             if (!$namespace && $currentNamespace != $task->getNamespace()) {
                 $currentNamespace = $task->getNamespace();
@@ -143,7 +144,7 @@ protected function outputAsXml($namespace, $tasks)
                 $taskXML->appendChild($dom->createTextNode($task->getName()));
             }
 
-            $taskXML = new DOMDocument('1.0', 'UTF-8');
+            $taskXML = new \DOMDocument('1.0', 'UTF-8');
             $taskXML->formatOutput = true;
             $taskXML->loadXML($task->asXml());
             $node = $taskXML->getElementsByTagName('task')->item(0);
diff --git a/lib/task/i18n/sfI18nExtractTask.class.php b/lib/task/i18n/sfI18nExtractTask.class.php
index 388ed14ed..d0378b227 100644
--- a/lib/task/i18n/sfI18nExtractTask.class.php
+++ b/lib/task/i18n/sfI18nExtractTask.class.php
@@ -1,9 +1,12 @@
 <?php
 
 /*
- * Current known limitations:
- *   - Can only works with the default "messages" catalogue
- *   - For file backends (XLIFF and gettext), it only saves/deletes strings in the "most global" file
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /*
@@ -21,23 +24,23 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nExtractTask extends sfBaseTask
+class sfI18nExtractTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    public function execute($arguments = array(), $options = array())
+    public function execute($arguments = [], $options = [])
     {
         $this->logSection('i18n', sprintf('extracting i18n strings for the "%s" application', $arguments['application']));
 
         // get i18n configuration from factories.yml
-        $config = sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
+        $config = \sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
 
         $class = $config['i18n']['class'];
         $params = $config['i18n']['param'];
         unset($params['cache']);
 
-        $extract = new sfI18nApplicationExtract(new $class($this->configuration, new sfNoCache(), $params), $arguments['culture']);
+        $extract = new \sfI18nApplicationExtract(new $class($this->configuration, new \sfNoCache(), $params), $arguments['culture']);
         $extract->extract();
 
         $this->logSection('i18n', sprintf('found "%d" new i18n strings', count($extract->getNewMessages())));
@@ -71,22 +74,22 @@ public function execute($arguments = array(), $options = array())
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('culture', sfCommandArgument::REQUIRED, 'The target culture'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_OPTIONAL, 'The environment', 'dev'),
-            new sfCommandOption('display-new', null, sfCommandOption::PARAMETER_NONE, 'Output all new found strings'),
-            new sfCommandOption('display-old', null, sfCommandOption::PARAMETER_NONE, 'Output all old strings'),
-            new sfCommandOption('auto-save', null, sfCommandOption::PARAMETER_NONE, 'Save the new strings'),
-            new sfCommandOption('auto-delete', null, sfCommandOption::PARAMETER_NONE, 'Delete old strings'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('culture', \sfCommandArgument::REQUIRED, 'The target culture'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The environment', 'dev'),
+            new \sfCommandOption('display-new', null, \sfCommandOption::PARAMETER_NONE, 'Output all new found strings'),
+            new \sfCommandOption('display-old', null, \sfCommandOption::PARAMETER_NONE, 'Output all old strings'),
+            new \sfCommandOption('auto-save', null, \sfCommandOption::PARAMETER_NONE, 'Save the new strings'),
+            new \sfCommandOption('auto-delete', null, \sfCommandOption::PARAMETER_NONE, 'Delete old strings'),
+        ]);
 
         $this->namespace = 'i18n';
         $this->name = 'extract';
diff --git a/lib/task/i18n/sfI18nFindTask.class.php b/lib/task/i18n/sfI18nFindTask.class.php
index 9209799db..e0605c117 100644
--- a/lib/task/i18n/sfI18nFindTask.class.php
+++ b/lib/task/i18n/sfI18nFindTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,32 +16,32 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18nFindTask extends sfBaseTask
+class sfI18nFindTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    public function execute($arguments = array(), $options = array())
+    public function execute($arguments = [], $options = [])
     {
         $this->logSection('i18n', sprintf('find non "i18n ready" strings in the "%s" application', $arguments['application']));
 
         // Look in templates
-        $dirs = array();
-        $moduleNames = sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_app_module_dir'));
+        $dirs = [];
+        $moduleNames = \sfFinder::type('dir')->maxdepth(0)->relative()->in(\sfConfig::get('sf_app_module_dir'));
         foreach ($moduleNames as $moduleName) {
-            $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';
+            $dirs[] = \sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';
         }
-        $dirs[] = sfConfig::get('sf_app_dir').'/templates';
+        $dirs[] = \sfConfig::get('sf_app_dir').'/templates';
 
-        $strings = array();
+        $strings = [];
         foreach ($dirs as $dir) {
-            $templates = sfFinder::type('file')->name('*.php')->in($dir);
+            $templates = \sfFinder::type('file')->name('*.php')->in($dir);
             foreach ($templates as $template) {
                 if (!isset($strings[$template])) {
-                    $strings[$template] = array();
+                    $strings[$template] = [];
                 }
 
-                $dom = new DOMDocument('1.0', sfConfig::get('sf_charset', 'UTF-8'));
+                $dom = new \DOMDocument('1.0', \sfConfig::get('sf_charset', 'UTF-8'));
                 $content = file_get_contents($template);
 
                 // remove doctype
@@ -48,7 +49,7 @@ public function execute($arguments = array(), $options = array())
 
                 @$dom->loadXML('<doc>'.$content.'</doc>');
 
-                $nodes = array($dom);
+                $nodes = [$dom];
                 while ($nodes) {
                     $node = array_shift($nodes);
 
@@ -82,7 +83,7 @@ public function execute($arguments = array(), $options = array())
                 continue;
             }
 
-            $this->logSection('i18n', sprintf('strings in "%s"', str_replace(sfConfig::get('sf_root_dir'), '', $template)), 1000);
+            $this->logSection('i18n', sprintf('strings in "%s"', str_replace(\sfConfig::get('sf_root_dir'), '', $template)), 1000);
             foreach ($messages as $message) {
                 $this->log("  {$message}\n");
             }
@@ -90,17 +91,17 @@ public function execute($arguments = array(), $options = array())
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+        ]);
 
         $this->namespace = 'i18n';
         $this->name = 'find';
diff --git a/lib/task/log/sfLogClearTask.class.php b/lib/task/log/sfLogClearTask.class.php
index 63913680f..08ff23ef5 100644
--- a/lib/task/log/sfLogClearTask.class.php
+++ b/lib/task/log/sfLogClearTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfLogClearTask extends sfBaseTask
+class sfLogClearTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
@@ -34,11 +35,11 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $logs = sfFinder::type('file')->in(sfConfig::get('sf_log_dir'));
+        $logs = \sfFinder::type('file')->in(\sfConfig::get('sf_log_dir'));
         $this->getFilesystem()->remove($logs);
     }
 }
diff --git a/lib/task/log/sfLogRotateTask.class.php b/lib/task/log/sfLogRotateTask.class.php
index db8edd525..785d88d56 100644
--- a/lib/task/log/sfLogRotateTask.class.php
+++ b/lib/task/log/sfLogRotateTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfLogRotateTask extends sfBaseTask
+class sfLogRotateTask extends \sfBaseTask
 {
     /** the default period to rotate logs in days */
     public const DEF_PERIOD = 7;
@@ -37,7 +38,7 @@ class sfLogRotateTask extends sfBaseTask
     public function rotate($app, $env, $period = null, $history = null, $override = false)
     {
         $logfile = $app.'_'.$env;
-        $logdir = sfConfig::get('sf_log_dir');
+        $logdir = \sfConfig::get('sf_log_dir');
 
         // set history and period values if not passed to default values
         $period = isset($period) ? $period : self::DEF_PERIOD;
@@ -52,7 +53,7 @@ public function rotate($app, $env, $period = null, $history = null, $override =
         }
 
         // determine date of last rotation
-        $logs = sfFinder::type('file')->maxdepth(1)->name($logfile.'_*.log')->sort_by_name()->in($logdir.'/history');
+        $logs = \sfFinder::type('file')->maxdepth(1)->name($logfile.'_*.log')->sort_by_name()->in($logdir.'/history');
         $recentlog = is_array($logs) ? array_pop($logs) : null;
 
         if ($recentlog) {
@@ -70,7 +71,7 @@ public function rotate($app, $env, $period = null, $history = null, $override =
         // if rotate log on date doesn't exist, or that date is today, then rotate the log
         if (!$rotateOn || ($rotateOn == $today) || $override) {
             // create a lock file
-            $lockFile = sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'-cli.lck';
+            $lockFile = \sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'-cli.lck';
             $this->getFilesystem()->touch($lockFile);
 
             // change mode so the web user can remove it if we die
@@ -95,7 +96,7 @@ public function rotate($app, $env, $period = null, $history = null, $override =
                 $this->getFilesystem()->remove($srcLog);
 
                 // get all log history files for this application and environment
-                $newLogs = sfFinder::type('file')->maxdepth(1)->name($logfile.'_*.log')->sort_by_name()->in($logdir.'/history');
+                $newLogs = \sfFinder::type('file')->maxdepth(1)->name($logfile.'_*.log')->sort_by_name()->in($logdir.'/history');
 
                 // if the number of logs in history exceeds history then remove the oldest log
                 if (count($newLogs) > $history) {
@@ -109,19 +110,19 @@ public function rotate($app, $env, $period = null, $history = null, $override =
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('env', sfCommandArgument::REQUIRED, 'The environment name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('env', \sfCommandArgument::REQUIRED, 'The environment name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('history', null, sfCommandOption::PARAMETER_REQUIRED, 'The maximum number of old log files to keep', self::DEF_HISTORY),
-            new sfCommandOption('period', null, sfCommandOption::PARAMETER_REQUIRED, 'The period in days', self::DEF_PERIOD),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('history', null, \sfCommandOption::PARAMETER_REQUIRED, 'The maximum number of old log files to keep', self::DEF_HISTORY),
+            new \sfCommandOption('period', null, \sfCommandOption::PARAMETER_REQUIRED, 'The period in days', self::DEF_PERIOD),
+        ]);
 
         $this->namespace = 'log';
         $this->name = 'rotate';
@@ -140,9 +141,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->rotate($arguments['application'], $arguments['env'], $options['period'], $options['history'], true);
     }
diff --git a/lib/task/plugin/sfPluginAddChannelTask.class.php b/lib/task/plugin/sfPluginAddChannelTask.class.php
index c5889327d..a982a43ef 100644
--- a/lib/task/plugin/sfPluginAddChannelTask.class.php
+++ b/lib/task/plugin/sfPluginAddChannelTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,16 +18,16 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginAddChannelTask extends sfPluginBaseTask
+class sfPluginAddChannelTask extends \sfPluginBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The channel name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED, 'The channel name'),
+        ]);
 
         $this->namespace = 'plugin';
         $this->name = 'add-channel';
@@ -41,9 +42,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('plugin', sprintf('add channel "%s"', $arguments['name']));
 
diff --git a/lib/task/plugin/sfPluginBaseTask.class.php b/lib/task/plugin/sfPluginBaseTask.class.php
index b7c657c90..edecf492e 100644
--- a/lib/task/plugin/sfPluginBaseTask.class.php
+++ b/lib/task/plugin/sfPluginBaseTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfPluginBaseTask extends sfBaseTask
+abstract class sfPluginBaseTask extends \sfBaseTask
 {
 }
diff --git a/lib/task/plugin/sfPluginInstallTask.class.php b/lib/task/plugin/sfPluginInstallTask.class.php
index 0a646f210..6113b2ecf 100644
--- a/lib/task/plugin/sfPluginInstallTask.class.php
+++ b/lib/task/plugin/sfPluginInstallTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,24 +18,24 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginInstallTask extends sfPluginBaseTask
+class sfPluginInstallTask extends \sfPluginBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The plugin name'),
-        ));
-
-        $this->addOptions(array(
-            new sfCommandOption('stability', 's', sfCommandOption::PARAMETER_REQUIRED, 'The preferred stability (stable, beta, alpha)', null),
-            new sfCommandOption('release', 'r', sfCommandOption::PARAMETER_REQUIRED, 'The preferred version', null),
-            new sfCommandOption('channel', 'c', sfCommandOption::PARAMETER_REQUIRED, 'The PEAR channel name', null),
-            new sfCommandOption('install_deps', 'd', sfCommandOption::PARAMETER_NONE, 'Whether to force installation of required dependencies', null),
-            new sfCommandOption('force-license', null, sfCommandOption::PARAMETER_NONE, 'Whether to force installation even if the license is not MIT like'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED, 'The plugin name'),
+        ]);
+
+        $this->addOptions([
+            new \sfCommandOption('stability', 's', \sfCommandOption::PARAMETER_REQUIRED, 'The preferred stability (stable, beta, alpha)', null),
+            new \sfCommandOption('release', 'r', \sfCommandOption::PARAMETER_REQUIRED, 'The preferred version', null),
+            new \sfCommandOption('channel', 'c', \sfCommandOption::PARAMETER_REQUIRED, 'The PEAR channel name', null),
+            new \sfCommandOption('install_deps', 'd', \sfCommandOption::PARAMETER_NONE, 'Whether to force installation of required dependencies', null),
+            new \sfCommandOption('force-license', null, \sfCommandOption::PARAMETER_NONE, 'Whether to force installation even if the license is not MIT like'),
+        ]);
 
         $this->namespace = 'plugin';
         $this->name = 'install';
@@ -87,9 +88,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('plugin', sprintf('installing plugin "%s"', $arguments['name']));
 
@@ -100,14 +101,14 @@ protected function execute($arguments = array(), $options = array())
         if (!$options['force-license']) {
             try {
                 $license = $this->getPluginManager()->getPluginLicense($arguments['name'], $options);
-            } catch (Exception $e) {
-                throw new sfCommandException(sprintf('%s (use --force-license to force installation)', $e->getMessage()));
+            } catch (\Exception $e) {
+                throw new \sfCommandException(sprintf('%s (use --force-license to force installation)', $e->getMessage()));
             }
 
             if (false !== $license) {
                 $temp = trim(str_replace('license', '', strtolower($license)));
-                if (null !== $license && !in_array($temp, array('mit', 'bsd', 'lgpl', 'php', 'apache'))) {
-                    throw new sfCommandException(sprintf('The license of this plugin "%s" is not MIT like (use --force-license to force installation).', $license));
+                if (null !== $license && !in_array($temp, ['mit', 'bsd', 'lgpl', 'php', 'apache'])) {
+                    throw new \sfCommandException(sprintf('The license of this plugin "%s" is not MIT like (use --force-license to force installation).', $license));
                 }
             }
         }
diff --git a/lib/task/plugin/sfPluginListTask.class.php b/lib/task/plugin/sfPluginListTask.class.php
index 9d5957b44..88b291f14 100644
--- a/lib/task/plugin/sfPluginListTask.class.php
+++ b/lib/task/plugin/sfPluginListTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,10 +18,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginListTask extends sfPluginBaseTask
+class sfPluginListTask extends \sfPluginBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
@@ -39,9 +40,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->log($this->formatter->format('Installed plugins:', 'COMMENT'));
 
diff --git a/lib/task/plugin/sfPluginPublishAssetsTask.class.php b/lib/task/plugin/sfPluginPublishAssetsTask.class.php
index f1de99698..0e61731a3 100644
--- a/lib/task/plugin/sfPluginPublishAssetsTask.class.php
+++ b/lib/task/plugin/sfPluginPublishAssetsTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,24 +18,24 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginPublishAssetsTask extends sfPluginBaseTask
+class sfPluginPublishAssetsTask extends \sfPluginBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('plugins', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'Publish this plugin\'s assets'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('plugins', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'Publish this plugin\'s assets'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('core-only', '', sfCommandOption::PARAMETER_NONE, 'If set only core plugins will publish their assets'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('core-only', '', \sfCommandOption::PARAMETER_NONE, 'If set only core plugins will publish their assets'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('relative', '', sfCommandOption::PARAMETER_NONE, 'If set symlinks will be relative'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('relative', '', \sfCommandOption::PARAMETER_NONE, 'If set symlinks will be relative'),
+        ]);
 
         $this->namespace = 'plugin';
         $this->name = 'publish-assets';
@@ -56,18 +57,18 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $enabledPlugins = $this->configuration->getPlugins();
 
         if ($diff = array_diff($arguments['plugins'], $enabledPlugins)) {
-            throw new InvalidArgumentException('Plugin(s) not found: '.implode(', ', $diff));
+            throw new \InvalidArgumentException('Plugin(s) not found: '.implode(', ', $diff));
         }
 
         if ($options['core-only']) {
-            $corePlugins = sfFinder::type('dir')->relative()->maxdepth(0)->in($this->configuration->getSymfonyLibDir().'/plugins');
+            $corePlugins = \sfFinder::type('dir')->relative()->maxdepth(0)->in($this->configuration->getSymfonyLibDir().'/plugins');
             $arguments['plugins'] = array_unique(array_merge($arguments['plugins'], array_intersect($enabledPlugins, $corePlugins)));
         } elseif (!count($arguments['plugins'])) {
             $arguments['plugins'] = $enabledPlugins;
@@ -93,9 +94,9 @@ protected function installPluginAssets($plugin, $dir, $relative)
 
         if (is_dir($webDir)) {
             if ($relative) {
-                $this->getFilesystem()->relativeSymlink($webDir, sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+                $this->getFilesystem()->relativeSymlink($webDir, \sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
             } else {
-                $this->getFilesystem()->symlink($webDir, sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+                $this->getFilesystem()->symlink($webDir, \sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
             }
         }
     }
diff --git a/lib/task/plugin/sfPluginUninstallTask.class.php b/lib/task/plugin/sfPluginUninstallTask.class.php
index cc5d01a12..29781a9d2 100644
--- a/lib/task/plugin/sfPluginUninstallTask.class.php
+++ b/lib/task/plugin/sfPluginUninstallTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,21 +18,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginUninstallTask extends sfPluginBaseTask
+class sfPluginUninstallTask extends \sfPluginBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The plugin name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED, 'The plugin name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('channel', 'c', sfCommandOption::PARAMETER_REQUIRED, 'The PEAR channel name', null),
-            new sfCommandOption('install_deps', 'd', sfCommandOption::PARAMETER_NONE, 'Whether to force installation of dependencies', null),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('channel', 'c', \sfCommandOption::PARAMETER_REQUIRED, 'The PEAR channel name', null),
+            new \sfCommandOption('install_deps', 'd', \sfCommandOption::PARAMETER_NONE, 'Whether to force installation of dependencies', null),
+        ]);
 
         $this->namespace = 'plugin';
         $this->name = 'uninstall';
@@ -65,9 +66,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('plugin', sprintf('uninstalling plugin "%s"', $arguments['name']));
 
diff --git a/lib/task/plugin/sfPluginUpgradeTask.class.php b/lib/task/plugin/sfPluginUpgradeTask.class.php
index 7159efda6..6ea84391f 100644
--- a/lib/task/plugin/sfPluginUpgradeTask.class.php
+++ b/lib/task/plugin/sfPluginUpgradeTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,22 +18,22 @@
  *
  * @version    SVN: $Id$
  */
-class sfPluginUpgradeTask extends sfPluginBaseTask
+class sfPluginUpgradeTask extends \sfPluginBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::REQUIRED, 'The plugin name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::REQUIRED, 'The plugin name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('stability', 's', sfCommandOption::PARAMETER_REQUIRED, 'The preferred stability (stable, beta, alpha)', null),
-            new sfCommandOption('release', 'r', sfCommandOption::PARAMETER_REQUIRED, 'The preferred version', null),
-            new sfCommandOption('channel', 'c', sfCommandOption::PARAMETER_REQUIRED, 'The PEAR channel name', null),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('stability', 's', \sfCommandOption::PARAMETER_REQUIRED, 'The preferred stability (stable, beta, alpha)', null),
+            new \sfCommandOption('release', 'r', \sfCommandOption::PARAMETER_REQUIRED, 'The preferred version', null),
+            new \sfCommandOption('channel', 'c', \sfCommandOption::PARAMETER_REQUIRED, 'The PEAR channel name', null),
+        ]);
 
         $this->namespace = 'plugin';
         $this->name = 'upgrade';
@@ -54,9 +55,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->logSection('plugin', sprintf('upgrading plugin "%s"', $arguments['name']));
 
diff --git a/lib/task/project/sfProjectClearControllersTask.class.php b/lib/task/project/sfProjectClearControllersTask.class.php
index 1335876a4..697c2d61f 100644
--- a/lib/task/project/sfProjectClearControllersTask.class.php
+++ b/lib/task/project/sfProjectClearControllersTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectClearControllersTask extends sfBaseTask
+class sfProjectClearControllersTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
@@ -55,12 +56,12 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $finder = sfFinder::type('file')->maxdepth(1)->name('*.php');
-        foreach ($finder->in(sfConfig::get('sf_web_dir')) as $controller) {
+        $finder = \sfFinder::type('file')->maxdepth(1)->name('*.php');
+        foreach ($finder->in(\sfConfig::get('sf_web_dir')) as $controller) {
             $content = file_get_contents($controller);
 
             if (preg_match('/ProjectConfiguration::getApplicationConfiguration\(\'(.*?)\', \'(.*?)\'/', $content, $match)) {
diff --git a/lib/task/project/sfProjectDeployTask.class.php b/lib/task/project/sfProjectDeployTask.class.php
index aa7db60a3..deea0fe9b 100644
--- a/lib/task/project/sfProjectDeployTask.class.php
+++ b/lib/task/project/sfProjectDeployTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectDeployTask extends sfBaseTask
+class sfProjectDeployTask extends \sfBaseTask
 {
     protected $outputBuffer = '';
     protected $errorBuffer = '';
@@ -43,19 +44,19 @@ public function logErrors($output)
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('server', sfCommandArgument::REQUIRED, 'The server name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('server', \sfCommandArgument::REQUIRED, 'The server name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('go', null, sfCommandOption::PARAMETER_NONE, 'Do the deployment'),
-            new sfCommandOption('rsync-dir', null, sfCommandOption::PARAMETER_REQUIRED, 'The directory where to look for rsync*.txt files', 'config'),
-            new sfCommandOption('rsync-options', null, sfCommandOption::PARAMETER_OPTIONAL, 'To options to pass to the rsync executable', '-azC --force --delete --progress'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('go', null, \sfCommandOption::PARAMETER_NONE, 'Do the deployment'),
+            new \sfCommandOption('rsync-dir', null, \sfCommandOption::PARAMETER_REQUIRED, 'The directory where to look for rsync*.txt files', 'config'),
+            new \sfCommandOption('rsync-options', null, \sfCommandOption::PARAMETER_OPTIONAL, 'To options to pass to the rsync executable', '-azC --force --delete --progress'),
+        ]);
 
         $this->namespace = 'project';
         $this->name = 'deploy';
@@ -107,31 +108,31 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $env = $arguments['server'];
 
-        $ini = sfConfig::get('sf_config_dir').'/properties.ini';
+        $ini = \sfConfig::get('sf_config_dir').'/properties.ini';
         if (!file_exists($ini)) {
-            throw new sfCommandException('You must create a config/properties.ini file');
+            throw new \sfCommandException('You must create a config/properties.ini file');
         }
 
         $properties = parse_ini_file($ini, true);
 
         if (!isset($properties[$env])) {
-            throw new sfCommandException(sprintf('You must define the configuration for server "%s" in config/properties.ini', $env));
+            throw new \sfCommandException(sprintf('You must define the configuration for server "%s" in config/properties.ini', $env));
         }
 
         $properties = $properties[$env];
 
         if (!isset($properties['host'])) {
-            throw new sfCommandException('You must define a "host" entry.');
+            throw new \sfCommandException('You must define a "host" entry.');
         }
 
         if (!isset($properties['dir'])) {
-            throw new sfCommandException('You must define a "dir" entry.');
+            throw new \sfCommandException('You must define a "dir" entry.');
         }
 
         $host = $properties['host'];
@@ -169,7 +170,7 @@ protected function execute($arguments = array(), $options = array())
         $dryRun = $options['go'] ? '' : '--dry-run';
         $command = "rsync {$dryRun} {$parameters} -e {$ssh} ./ {$user}{$host}:{$dir}";
 
-        $this->getFilesystem()->execute($command, $options['trace'] ? array($this, 'logOutput') : null, array($this, 'logErrors'));
+        $this->getFilesystem()->execute($command, $options['trace'] ? [$this, 'logOutput'] : null, [$this, 'logErrors']);
 
         $this->clearBuffers();
     }
diff --git a/lib/task/project/sfProjectDisableTask.class.php b/lib/task/project/sfProjectDisableTask.class.php
index 3069cd6d9..9ba28c854 100644
--- a/lib/task/project/sfProjectDisableTask.class.php
+++ b/lib/task/project/sfProjectDisableTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectDisableTask extends sfBaseTask
+class sfProjectDisableTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('env', sfCommandArgument::REQUIRED, 'The environment name'),
-            new sfCommandArgument('app', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'The application name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('env', \sfCommandArgument::REQUIRED, 'The environment name'),
+            new \sfCommandArgument('app', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'The application name'),
+        ]);
 
         $this->namespace = 'project';
         $this->name = 'disable';
@@ -44,21 +45,21 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        if (1 == count($arguments['app']) && !file_exists(sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0])) {
+        if (1 == count($arguments['app']) && !file_exists(\sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0])) {
             // support previous task signature
-            $applications = array($arguments['env']);
+            $applications = [$arguments['env']];
             $env = $arguments['app'][0];
         } else {
-            $applications = count($arguments['app']) ? $arguments['app'] : sfFinder::type('dir')->relative()->maxdepth(0)->in(sfConfig::get('sf_apps_dir'));
+            $applications = count($arguments['app']) ? $arguments['app'] : \sfFinder::type('dir')->relative()->maxdepth(0)->in(\sfConfig::get('sf_apps_dir'));
             $env = $arguments['env'];
         }
 
         foreach ($applications as $app) {
-            $lockFile = sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'.lck';
+            $lockFile = \sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'.lck';
             if (file_exists($lockFile)) {
                 $this->logSection('enable', sprintf('%s [%s] is currently DISABLED', $app, $env));
             } else {
diff --git a/lib/task/project/sfProjectEnableTask.class.php b/lib/task/project/sfProjectEnableTask.class.php
index 2330c6a36..6659f1bad 100644
--- a/lib/task/project/sfProjectEnableTask.class.php
+++ b/lib/task/project/sfProjectEnableTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectEnableTask extends sfBaseTask
+class sfProjectEnableTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('env', sfCommandArgument::REQUIRED, 'The environment name'),
-            new sfCommandArgument('app', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'The application name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('env', \sfCommandArgument::REQUIRED, 'The environment name'),
+            new \sfCommandArgument('app', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'The application name'),
+        ]);
 
         $this->namespace = 'project';
         $this->name = 'enable';
@@ -44,30 +45,30 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        if (1 == count($arguments['app']) && !file_exists(sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0])) {
+        if (1 == count($arguments['app']) && !file_exists(\sfConfig::get('sf_apps_dir').'/'.$arguments['app'][0])) {
             // support previous task signature
-            $applications = array($arguments['env']);
+            $applications = [$arguments['env']];
             $env = $arguments['app'][0];
         } else {
-            $applications = count($arguments['app']) ? $arguments['app'] : sfFinder::type('dir')->relative()->maxdepth(0)->in(sfConfig::get('sf_apps_dir'));
+            $applications = count($arguments['app']) ? $arguments['app'] : \sfFinder::type('dir')->relative()->maxdepth(0)->in(\sfConfig::get('sf_apps_dir'));
             $env = $arguments['env'];
         }
 
         foreach ($applications as $app) {
-            $lockFile = sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'.lck';
+            $lockFile = \sfConfig::get('sf_data_dir').'/'.$app.'_'.$env.'.lck';
             if (!file_exists($lockFile)) {
                 $this->logSection('enable', sprintf('%s [%s] is currently ENABLED', $app, $env));
             } else {
                 $this->getFilesystem()->remove($lockFile);
 
-                $clearCache = new sfCacheClearTask($this->dispatcher, $this->formatter);
+                $clearCache = new \sfCacheClearTask($this->dispatcher, $this->formatter);
                 $clearCache->setCommandApplication($this->commandApplication);
                 $clearCache->setConfiguration($this->configuration);
-                $clearCache->run(array(), array('--app='.$app, '--env='.$env));
+                $clearCache->run([], ['--app='.$app, '--env='.$env]);
 
                 $this->logSection('enable', sprintf('%s [%s] has been ENABLED', $app, $env));
             }
diff --git a/lib/task/project/sfProjectOptimizeTask.class.php b/lib/task/project/sfProjectOptimizeTask.class.php
index bb29bdc6b..cd73e501a 100644
--- a/lib/task/project/sfProjectOptimizeTask.class.php
+++ b/lib/task/project/sfProjectOptimizeTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectOptimizeTask extends sfBaseTask
+class sfProjectOptimizeTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('env', sfCommandArgument::OPTIONAL, 'The environment name', 'prod'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('env', \sfCommandArgument::OPTIONAL, 'The environment name', 'prod'),
+        ]);
 
         $this->namespace = 'project';
         $this->name = 'optimize';
@@ -42,13 +43,13 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $data = array();
+        $data = [];
         $modules = $this->findModules();
-        $target = sfConfig::get('sf_cache_dir').'/'.$arguments['application'].'/'.$arguments['env'].'/config/configuration.php';
+        $target = \sfConfig::get('sf_cache_dir').'/'.$arguments['application'].'/'.$arguments['env'].'/config/configuration.php';
 
         $current_umask = umask();
         umask(0000);
@@ -62,7 +63,7 @@ protected function execute($arguments = array(), $options = array())
         $this->setConfiguration($this->createConfiguration($arguments['application'], $arguments['env']));
 
         // initialize the context
-        sfContext::createInstance($this->configuration);
+        \sfContext::createInstance($this->configuration);
 
         // force cache generation for generated modules
         foreach ($modules as $module) {
@@ -70,8 +71,8 @@ protected function execute($arguments = array(), $options = array())
 
             try {
                 $this->configuration->getConfigCache()->checkConfig('modules/'.$module.'/config/generator.yml', true);
-            } catch (Exception $e) {
-                $this->dispatcher->notifyUntil(new sfEvent($e, 'application.throw_exception'));
+            } catch (\Exception $e) {
+                $this->dispatcher->notifyUntil(new \sfEvent($e, 'application.throw_exception'));
 
                 $this->logSection($module, $e->getMessage(), null, 'ERROR');
             }
@@ -96,7 +97,7 @@ protected function execute($arguments = array(), $options = array())
 
     protected function optimizeGetControllerDirs($modules)
     {
-        $data = array();
+        $data = [];
         foreach ($modules as $module) {
             $data[$module] = $this->configuration->getControllerDirs($module);
         }
@@ -106,9 +107,9 @@ protected function optimizeGetControllerDirs($modules)
 
     protected function optimizeGetTemplateDir($modules, $templates)
     {
-        $data = array();
+        $data = [];
         foreach ($modules as $module) {
-            $data[$module] = array();
+            $data[$module] = [];
             foreach ($templates[$module] as $template) {
                 if (null !== $dir = $this->configuration->getTemplateDir($module, $template)) {
                     $data[$module][$template] = $dir;
@@ -121,13 +122,13 @@ protected function optimizeGetTemplateDir($modules, $templates)
 
     protected function optimizeLoadHelpers($modules)
     {
-        $data = array();
+        $data = [];
 
-        $finder = sfFinder::type('file')->name('*Helper.php');
+        $finder = \sfFinder::type('file')->name('*Helper.php');
 
         // module helpers
         foreach ($modules as $module) {
-            $helpers = array();
+            $helpers = [];
 
             $dirs = $this->configuration->getHelperDirs($module);
             foreach ($finder->in($dirs[0]) as $file) {
@@ -154,10 +155,10 @@ protected function optimizeLoadHelpers($modules)
 
     protected function findTemplates($modules)
     {
-        $files = array();
+        $files = [];
 
         foreach ($modules as $module) {
-            $files[$module] = sfFinder::type('file')->follow_link()->relative()->in($this->configuration->getTemplateDirs($module));
+            $files[$module] = \sfFinder::type('file')->follow_link()->relative()->in($this->configuration->getTemplateDirs($module));
         }
 
         return $files;
@@ -166,20 +167,20 @@ protected function findTemplates($modules)
     protected function findModules()
     {
         // application
-        $dirs = array(sfConfig::get('sf_app_module_dir'));
+        $dirs = [\sfConfig::get('sf_app_module_dir')];
 
         // plugins
         $pluginSubPaths = $this->configuration->getPluginSubPaths(DIRECTORY_SEPARATOR.'modules');
-        $modules = array();
-        foreach (sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in($pluginSubPaths) as $module) {
-            if (in_array($module, sfConfig::get('sf_enabled_modules'))) {
+        $modules = [];
+        foreach (\sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in($pluginSubPaths) as $module) {
+            if (in_array($module, \sfConfig::get('sf_enabled_modules'))) {
                 $modules[] = $module;
             }
         }
 
         // core modules
-        $dirs[] = sfConfig::get('sf_symfony_lib_dir').'/controller';
+        $dirs[] = \sfConfig::get('sf_symfony_lib_dir').'/controller';
 
-        return array_unique(array_merge(sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in($dirs), $modules));
+        return array_unique(array_merge(\sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in($dirs), $modules));
     }
 }
diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php
index fe5911182..1679239c3 100644
--- a/lib/task/project/sfProjectPermissionsTask.class.php
+++ b/lib/task/project/sfProjectPermissionsTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectPermissionsTask extends sfBaseTask
+class sfProjectPermissionsTask extends \sfBaseTask
 {
     protected $current;
-    protected $failed = array();
+    protected $failed = [];
 
     /**
      * Captures those chmod commands that fail.
      *
      * @see http://www.php.net/set_error_handler
      *
-     * @param mixed|null $context
+     * @param \mixed|null $context
      */
     public function handleError($no, $string, $file, $line, $context = null)
     {
@@ -33,7 +34,7 @@ public function handleError($no, $string, $file, $line, $context = null)
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
@@ -49,26 +50,26 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        if (file_exists(sfConfig::get('sf_upload_dir'))) {
-            $this->chmod(sfConfig::get('sf_upload_dir'), 0777);
+        if (file_exists(\sfConfig::get('sf_upload_dir'))) {
+            $this->chmod(\sfConfig::get('sf_upload_dir'), 0777);
         }
 
-        $this->chmod(sfConfig::get('sf_cache_dir'), 0777);
-        $this->chmod(sfConfig::get('sf_log_dir'), 0777);
-        $this->chmod(sfConfig::get('sf_root_dir').'/symfony', 0777);
+        $this->chmod(\sfConfig::get('sf_cache_dir'), 0777);
+        $this->chmod(\sfConfig::get('sf_log_dir'), 0777);
+        $this->chmod(\sfConfig::get('sf_root_dir').'/symfony', 0777);
 
-        $dirs = array(
-            sfConfig::get('sf_cache_dir'),
-            sfConfig::get('sf_log_dir'),
-            sfConfig::get('sf_upload_dir'),
-        );
+        $dirs = [
+            \sfConfig::get('sf_cache_dir'),
+            \sfConfig::get('sf_log_dir'),
+            \sfConfig::get('sf_upload_dir'),
+        ];
 
-        $dirFinder = sfFinder::type('dir');
-        $fileFinder = sfFinder::type('file');
+        $dirFinder = \sfFinder::type('dir');
+        $fileFinder = \sfFinder::type('file');
 
         foreach ($dirs as $dir) {
             $this->chmod($dirFinder->in($dir), 0777);
@@ -78,8 +79,8 @@ protected function execute($arguments = array(), $options = array())
         // note those files that failed
         if (count($this->failed)) {
             $this->logBlock(array_merge(
-                array('Permissions on the following file(s) could not be fixed:', ''),
-                array_map(function ($f) { return ' - '.sfDebug::shortenFilePath($f); }, $this->failed)
+                ['Permissions on the following file(s) could not be fixed:', ''],
+                array_map(function ($f) { return ' - '.\sfDebug::shortenFilePath($f); }, $this->failed)
             ), 'ERROR_LARGE');
         }
     }
@@ -91,7 +92,7 @@ protected function execute($arguments = array(), $options = array())
      * @param int    $mode
      * @param int    $umask
      *
-     * @see sfFilesystem
+     * @see \sfFilesystem
      */
     protected function chmod($file, $mode, $umask = 0000)
     {
@@ -100,7 +101,7 @@ protected function chmod($file, $mode, $umask = 0000)
                 $this->chmod($f, $mode, $umask);
             }
         } else {
-            set_error_handler(array($this, 'handleError'));
+            set_error_handler([$this, 'handleError']);
 
             $this->current = $file;
             @$this->getFilesystem()->chmod($file, $mode, $umask);
diff --git a/lib/task/project/sfProjectSendEmailsTask.class.php b/lib/task/project/sfProjectSendEmailsTask.class.php
index d6280c464..48ebdd1b9 100644
--- a/lib/task/project/sfProjectSendEmailsTask.class.php
+++ b/lib/task/project/sfProjectSendEmailsTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,19 +16,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfProjectSendEmailsTask extends sfBaseTask
+class sfProjectSendEmailsTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-            new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-            new sfCommandOption('message-limit', null, sfCommandOption::PARAMETER_OPTIONAL, 'The maximum number of messages to send', 0),
-            new sfCommandOption('time-limit', null, sfCommandOption::PARAMETER_OPTIONAL, 'The time limit for sending messages (in seconds)', 0),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('application', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+            new \sfCommandOption('env', null, \sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+            new \sfCommandOption('message-limit', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The maximum number of messages to send', 0),
+            new \sfCommandOption('time-limit', null, \sfCommandOption::PARAMETER_OPTIONAL, 'The time limit for sending messages (in seconds)', 0),
+        ]);
 
         $this->namespace = 'project';
         $this->name = 'send-emails';
@@ -49,9 +50,9 @@ protected function configure()
 EOF;
     }
 
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        $databaseManager = new sfDatabaseManager($this->configuration);
+        $databaseManager = new \sfDatabaseManager($this->configuration);
 
         $spool = $this->getMailer()->getSpool();
         $spool->setMessageLimit($options['message-limit']);
diff --git a/lib/task/project/sfProjectValidateTask.class.php b/lib/task/project/sfProjectValidateTask.class.php
index 2b30cf29b..2418a5f53 100644
--- a/lib/task/project/sfProjectValidateTask.class.php
+++ b/lib/task/project/sfProjectValidateTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidateTask extends sfBaseTask
+class sfValidateTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
@@ -37,9 +38,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         foreach ($this->getUpgradeClasses() as $i => $class) {
             $v = new $class($this->dispatcher, $this->formatter);
@@ -72,16 +73,16 @@ protected function execute($arguments = array(), $options = array())
 
     protected function formatFile($file)
     {
-        return str_replace(realpath(sfConfig::get('sf_root_dir')), 'ROOT', realpath($file));
+        return str_replace(realpath(\sfConfig::get('sf_root_dir')), 'ROOT', realpath($file));
     }
 
     protected function getUpgradeClasses()
     {
         $baseDir = __DIR__.'/validation/';
-        $classes = array();
+        $classes = [];
 
         foreach (glob($baseDir.'*.class.php') as $file) {
-            $class = str_replace(array($baseDir, '.class.php'), '', $file);
+            $class = str_replace([$baseDir, '.class.php'], '', $file);
 
             if ('sfValidation' != $class) {
                 $classes[] = $class;
diff --git a/lib/task/project/validation/sfDeprecatedClassesValidation.class.php b/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
index b4df0ff8d..11137441d 100644
--- a/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDeprecatedClassesValidation extends sfValidation
+class sfDeprecatedClassesValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,7 +25,7 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The files above use deprecated classes',
             '  that have been removed in symfony 1.4.',
@@ -34,12 +35,12 @@ public function getExplanation()
             '',
             '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
-        $classes = array(
+        $classes = [
             'sfDoctrineLogger', 'sfNoRouting', 'sfPathInfoRouting', 'sfRichTextEditor',
             'sfRichTextEditorFCK', 'sfRichTextEditorTinyMCE', 'sfCrudGenerator', 'sfAdminGenerator',
             'sfPropelCrudGenerator', 'sfPropelAdminGenerator', 'sfPropelUniqueValidator', 'sfDoctrineUniqueValidator',
@@ -59,19 +60,19 @@ public function validate()
             'sfRequestCompat10', 'sfFillInForm', 'sfCallbackValidator', 'sfCompareValidator', 'sfDateValidator',
             'sfEmailValidator', 'sfFileValidator', 'sfNumberValidator', 'sfRegexValidator', 'sfStringValidator',
             'sfUrlValidator', 'sfValidator', 'sfValidatorManager', 'sfMailView', 'sfMail',
-        );
+        ];
 
-        $found = array();
-        $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in(array(
-            sfConfig::get('sf_apps_dir'),
-            sfConfig::get('sf_lib_dir'),
-            sfConfig::get('sf_test_dir'),
-            sfConfig::get('sf_plugins_dir'),
-        ));
+        $found = [];
+        $files = \sfFinder::type('file')->name('*.php')->prune('vendor')->in([
+            \sfConfig::get('sf_apps_dir'),
+            \sfConfig::get('sf_lib_dir'),
+            \sfConfig::get('sf_test_dir'),
+            \sfConfig::get('sf_plugins_dir'),
+        ]);
         foreach ($files as $file) {
-            $content = sfToolkit::stripComments(file_get_contents($file));
+            $content = \sfToolkit::stripComments(file_get_contents($file));
 
-            $matches = array();
+            $matches = [];
             foreach ($classes as $class) {
                 if (preg_match('#\b'.preg_quote($class, '#').'\b#', $content)) {
                     $matches[] = $class;
diff --git a/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php b/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
index f7b41f376..5458852b8 100644
--- a/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDeprecatedConfigurationFilesValidation extends sfValidation
+class sfDeprecatedConfigurationFilesValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,42 +25,42 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The project uses deprecated configuration files',
             '  that have been removed in symfony 1.4 (mailer.yml, validate/*.yml)',
             '  or for which the format changed (generator.yml)',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
         // mailer.yml
-        $files = sfFinder::type('file')->name('mailer.yml')->in($this->getProjectConfigDirectories());
-        $found = array();
+        $files = \sfFinder::type('file')->name('mailer.yml')->in($this->getProjectConfigDirectories());
+        $found = [];
         foreach ($files as $file) {
             $found[$file] = true;
         }
 
         // modules/*/validate/*.yml
-        $files = sfFinder::type('file')->name('*.yml')->in(array_merge(
-            glob(sfConfig::get('sf_apps_dir').'/*/modules/*/validate'),
-            glob(sfConfig::get('sf_plugins_dir').'/*/modules/*/validate')
+        $files = \sfFinder::type('file')->name('*.yml')->in(array_merge(
+            glob(\sfConfig::get('sf_apps_dir').'/*/modules/*/validate'),
+            glob(\sfConfig::get('sf_plugins_dir').'/*/modules/*/validate')
         ));
         foreach ($files as $file) {
             $found[$file] = true;
         }
 
         // old generator.yml
-        $files = sfFinder::type('file')->name('generator.yml')->in(array(
-            sfConfig::get('sf_apps_dir'),
-            sfConfig::get('sf_plugins_dir'),
-        ));
+        $files = \sfFinder::type('file')->name('generator.yml')->in([
+            \sfConfig::get('sf_apps_dir'),
+            \sfConfig::get('sf_plugins_dir'),
+        ]);
         foreach ($files as $file) {
             $content = file_get_contents($file);
 
-            if (false !== strpos($content, 'sfPropelAdminGenerator')) {
+            if (str_contains($content, 'sfPropelAdminGenerator')) {
                 $found[$file] = true;
             }
         }
diff --git a/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php b/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
index 4be0e711a..7fef9f1a9 100644
--- a/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDeprecatedHelpersValidation extends sfValidation
+class sfDeprecatedHelpersValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,7 +25,7 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The files above use deprecated helpers',
             '  that have been removed in symfony 1.4.',
@@ -34,12 +35,12 @@ public function getExplanation()
             '',
             '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
-        $helpers = array(
+        $helpers = [
             'select_day_tag', 'select_month_tag', 'select_year_tag', 'select_date_tag', 'select_second_tag',
             'select_minute_tag', 'select_hour_tag', 'select_ampm_tag', 'select_time_tag', 'select_datetime_tag',
             'select_number_tag', 'select_timezone_tag', 'options_for_select', 'select_tag', 'select_country_tag',
@@ -54,19 +55,19 @@ public function validate()
             'submit_to_remote', 'submit_image_to_remote', 'update_element_function', 'evaluate_remote_response',
             'remote_function', 'observe_field', 'observe_form', 'visual_effect', 'sortable_element',
             'draggable_element', 'drop_receiving_element', 'input_auto_complete_tag', 'input_in_place_editor_tag',
-        );
+        ];
 
-        $found = array();
-        $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in(array(
-            sfConfig::get('sf_apps_dir'),
-            sfConfig::get('sf_lib_dir'),
-            sfConfig::get('sf_test_dir'),
-            sfConfig::get('sf_plugins_dir'),
-        ));
+        $found = [];
+        $files = \sfFinder::type('file')->name('*.php')->prune('vendor')->in([
+            \sfConfig::get('sf_apps_dir'),
+            \sfConfig::get('sf_lib_dir'),
+            \sfConfig::get('sf_test_dir'),
+            \sfConfig::get('sf_plugins_dir'),
+        ]);
         foreach ($files as $file) {
-            $content = sfToolkit::stripComments(file_get_contents($file));
+            $content = \sfToolkit::stripComments(file_get_contents($file));
 
-            $matches = array();
+            $matches = [];
             foreach ($helpers as $helper) {
                 if (preg_match('#\b'.preg_quote($helper, '#').'\b#', $content)) {
                     $matches[] = $helper;
diff --git a/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php b/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
index 2d12c03ad..0966050b4 100644
--- a/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDeprecatedMethodsValidation extends sfValidation
+class sfDeprecatedMethodsValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,7 +25,7 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The files above use deprecated functions and/or methods',
             '  that have been removed in symfony 1.4.',
@@ -34,13 +35,13 @@ public function getExplanation()
             '',
             '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
         return array_merge(
-            $this->doValidate(array(
+            $this->doValidate([
                 'sfToolkit::getTmpDir',
                 'sfToolkit::removeArrayValueForPath',
                 'sfToolkit::hasArrayValueForPath',
@@ -52,30 +53,30 @@ public function validate()
                 'getXDebugStack',
                 'checkSymfonyVersion',
                 'sh',
-            ), array(
-                sfConfig::get('sf_apps_dir'),
-                sfConfig::get('sf_lib_dir'),
-                sfConfig::get('sf_test_dir'),
-                sfConfig::get('sf_plugins_dir'),
-            )),
-            $this->doValidate(array(
+            ], [
+                \sfConfig::get('sf_apps_dir'),
+                \sfConfig::get('sf_lib_dir'),
+                \sfConfig::get('sf_test_dir'),
+                \sfConfig::get('sf_plugins_dir'),
+            ]),
+            $this->doValidate([
                 'contains', 'responseContains', 'isRequestParameter', 'isResponseHeader',
                 'isUserCulture', 'isRequestFormat', 'checkResponseElement',
-            ), sfConfig::get('sf_test_dir')),
-            $this->doValidate(array(
+            ], \sfConfig::get('sf_test_dir')),
+            $this->doValidate([
                 'getDefaultView', 'handleError', 'validate', 'debugMessage', 'getController()->sendEmail',
-            ), $this->getProjectActionDirectories())
+            ], $this->getProjectActionDirectories())
         );
     }
 
     public function doValidate($methods, $dir)
     {
-        $found = array();
-        $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in($dir);
+        $found = [];
+        $files = \sfFinder::type('file')->name('*.php')->prune('vendor')->in($dir);
         foreach ($files as $file) {
-            $content = sfToolkit::stripComments(file_get_contents($file));
+            $content = \sfToolkit::stripComments(file_get_contents($file));
 
-            $matches = array();
+            $matches = [];
             foreach ($methods as $method) {
                 if (preg_match('#\b'.preg_quote($method, '#').'\b#', $content)) {
                     $matches[] = $method;
diff --git a/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php b/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
index 7c1a5d77e..03b96726f 100644
--- a/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDeprecatedPluginsValidation extends sfValidation
+class sfDeprecatedPluginsValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,28 +25,28 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The files above use deprecated plugins',
             '  that have been removed in symfony 1.4.',
             '',
             'You can probably remove those references safely.',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
-        $found = array();
-        $files = sfFinder::type('file')->name('*Configuration.class.php')->in($this->getProjectConfigDirectories());
+        $found = [];
+        $files = \sfFinder::type('file')->name('*Configuration.class.php')->in($this->getProjectConfigDirectories());
         foreach ($files as $file) {
-            $content = sfToolkit::stripComments(file_get_contents($file));
+            $content = \sfToolkit::stripComments(file_get_contents($file));
 
-            $matches = array();
-            if (false !== strpos($content, 'sfCompat10Plugin')) {
+            $matches = [];
+            if (str_contains($content, 'sfCompat10Plugin')) {
                 $matches[] = 'sfCompat10Plugin';
             }
-            if (false !== strpos($content, 'sfProtoculousPlugin')) {
+            if (str_contains($content, 'sfProtoculousPlugin')) {
                 $matches[] = 'sfProtoculousPlugin';
             }
 
diff --git a/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php b/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
index e0971109a..8262f93e6 100644
--- a/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
+++ b/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfDeprecatedSettingsValidation extends sfValidation
+class sfDeprecatedSettingsValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,7 +25,7 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The files above use deprecated settings',
             '  that have been removed in symfony 1.4.',
@@ -34,29 +35,29 @@ public function getExplanation()
             '',
             '  http://www.symfony-project.org/tutorial/1_4/en/deprecated',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
-        $settings = array(
+        $settings = [
             'sf_check_symfony_version', 'sf_max_forwards', 'sf_lazy_cache_key', 'sf_strip_comments',
             'sf_lazy_routes_deserialize', 'sf_calendar_web_dir', 'sf_rich_text_js_dir', 'sf_validation_error_prefix',
             'sf_validation_error_suffix', 'sf_validation_error_class', 'sf_validation_error_id_prefix',
             '_is_internal', 'sf_doc_dir',
-        );
+        ];
 
-        $found = array();
-        $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in(array(
-            sfConfig::get('sf_apps_dir'),
-            sfConfig::get('sf_lib_dir'),
-            sfConfig::get('sf_test_dir'),
-            sfConfig::get('sf_plugins_dir'),
-        ));
+        $found = [];
+        $files = \sfFinder::type('file')->name('*.php')->prune('vendor')->in([
+            \sfConfig::get('sf_apps_dir'),
+            \sfConfig::get('sf_lib_dir'),
+            \sfConfig::get('sf_test_dir'),
+            \sfConfig::get('sf_plugins_dir'),
+        ]);
         foreach ($files as $file) {
-            $content = sfToolkit::stripComments(file_get_contents($file));
+            $content = \sfToolkit::stripComments(file_get_contents($file));
 
-            $matches = array();
+            $matches = [];
             foreach ($settings as $setting) {
                 if (false !== stripos($content, $setting)) {
                     $matches[] = $setting;
diff --git a/lib/task/project/validation/sfParameterHolderValidation.class.php b/lib/task/project/validation/sfParameterHolderValidation.class.php
index cd62c9340..2848ff217 100644
--- a/lib/task/project/validation/sfParameterHolderValidation.class.php
+++ b/lib/task/project/validation/sfParameterHolderValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfParameterHolderValidation extends sfValidation
+class sfParameterHolderValidation extends \sfValidation
 {
     public function getHeader()
     {
@@ -24,7 +25,7 @@ public function getHeader()
 
     public function getExplanation()
     {
-        return array(
+        return [
             '',
             '  The files above use the array notation with a parameter holder,',
             '  which is not supported anymore in symfony 1.4.',
@@ -37,20 +38,20 @@ public function getExplanation()
             '    $params = $request->getParameter(\'foo\')',
             '    $foo = $params[\'bar\'])',
             '',
-        );
+        ];
     }
 
     public function validate()
     {
-        $found = array();
-        $files = sfFinder::type('file')->name('*.php')->prune('vendor')->in(array(
-            sfConfig::get('sf_apps_dir'),
-            sfConfig::get('sf_lib_dir'),
-            sfConfig::get('sf_test_dir'),
-            sfConfig::get('sf_plugins_dir'),
-        ));
+        $found = [];
+        $files = \sfFinder::type('file')->name('*.php')->prune('vendor')->in([
+            \sfConfig::get('sf_apps_dir'),
+            \sfConfig::get('sf_lib_dir'),
+            \sfConfig::get('sf_test_dir'),
+            \sfConfig::get('sf_plugins_dir'),
+        ]);
         foreach ($files as $file) {
-            $content = sfToolkit::stripComments(file_get_contents($file));
+            $content = \sfToolkit::stripComments(file_get_contents($file));
 
             if (preg_match('#\b(get|has|remove)(Request)*Parameter\(\s*[\'"][^\),]*?\[[^\),]#', $content)) {
                 $found[$file] = true;
diff --git a/lib/task/project/validation/sfValidation.class.php b/lib/task/project/validation/sfValidation.class.php
index 9fd1e93ad..cd74efbe6 100644
--- a/lib/task/project/validation/sfValidation.class.php
+++ b/lib/task/project/validation/sfValidation.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfValidation extends sfBaseTask
+abstract class sfValidation extends \sfBaseTask
 {
     protected $task;
 
@@ -26,9 +27,9 @@ abstract public function validate();
 
     abstract public function getHeader();
 
-    public function execute($arguments = array(), $options = array())
+    public function execute($arguments = [], $options = [])
     {
-        throw new sfException('You can\'t execute this task.');
+        throw new \sfException('You can\'t execute this task.');
     }
 
     /**
@@ -36,11 +37,11 @@ public function execute($arguments = array(), $options = array())
      *
      * @param string $type String directory or file or any (for both file and directory)
      *
-     * @return sfFinder A sfFinder instance
+     * @return \sfFinder A sfFinder instance
      */
     protected function getFinder($type)
     {
-        return sfFinder::type($type)->prune('symfony')->discard('symfony');
+        return \sfFinder::type($type)->prune('symfony')->discard('symfony');
     }
 
     /**
@@ -60,8 +61,8 @@ protected function getProjectClassDirectories()
     protected function getProjectTemplateDirectories()
     {
         return array_merge(
-            glob(sfConfig::get('sf_apps_dir').'/*/modules/*/templates'),
-            glob(sfConfig::get('sf_apps_dir').'/*/templates')
+            glob(\sfConfig::get('sf_apps_dir').'/*/modules/*/templates'),
+            glob(\sfConfig::get('sf_apps_dir').'/*/templates')
         );
     }
 
@@ -70,7 +71,7 @@ protected function getProjectTemplateDirectories()
      */
     protected function getProjectActionDirectories()
     {
-        return glob(sfConfig::get('sf_apps_dir').'/*/modules/*/actions');
+        return glob(\sfConfig::get('sf_apps_dir').'/*/modules/*/actions');
     }
 
     /**
@@ -81,12 +82,12 @@ protected function getProjectActionDirectories()
     protected function getProjectLibDirectories($subdirectory = null)
     {
         return array_merge(
-            glob(sfConfig::get('sf_apps_dir').'/*/modules/*/lib'.$subdirectory),
-            glob(sfConfig::get('sf_apps_dir').'/*/lib'.$subdirectory),
-            array(
-                sfConfig::get('sf_apps_dir').'/lib'.$subdirectory,
-                sfConfig::get('sf_lib_dir').$subdirectory,
-            )
+            glob(\sfConfig::get('sf_apps_dir').'/*/modules/*/lib'.$subdirectory),
+            glob(\sfConfig::get('sf_apps_dir').'/*/lib'.$subdirectory),
+            [
+                \sfConfig::get('sf_apps_dir').'/lib'.$subdirectory,
+                \sfConfig::get('sf_lib_dir').$subdirectory,
+            ]
         );
     }
 
@@ -96,9 +97,9 @@ protected function getProjectLibDirectories($subdirectory = null)
     protected function getProjectConfigDirectories()
     {
         return array_merge(
-            glob(sfConfig::get('sf_apps_dir').'/*/modules/*/config'),
-            glob(sfConfig::get('sf_apps_dir').'/*/config'),
-            glob(sfConfig::get('sf_config_dir'))
+            glob(\sfConfig::get('sf_apps_dir').'/*/modules/*/config'),
+            glob(\sfConfig::get('sf_apps_dir').'/*/config'),
+            glob(\sfConfig::get('sf_config_dir'))
         );
     }
 
@@ -109,6 +110,6 @@ protected function getProjectConfigDirectories()
      */
     protected function getApplications()
     {
-        return sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_apps_dir'));
+        return \sfFinder::type('dir')->maxdepth(0)->relative()->in(\sfConfig::get('sf_apps_dir'));
     }
 }
diff --git a/lib/task/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php
index f6d8af988..479c664ad 100644
--- a/lib/task/sfBaseTask.class.php
+++ b/lib/task/sfBaseTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,18 +16,18 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfBaseTask extends sfCommandApplicationTask
+abstract class sfBaseTask extends \sfCommandApplicationTask
 {
     protected $configuration;
     protected $pluginManager;
     protected $statusStartTime;
     protected $filesystem;
-    protected $tokens = array();
+    protected $tokens = [];
 
     /**
      * Sets the current task's configuration.
      */
-    public function setConfiguration(sfProjectConfiguration $configuration = null)
+    public function setConfiguration(\sfProjectConfiguration $configuration = null)
     {
         $this->configuration = $configuration;
     }
@@ -34,15 +35,15 @@ public function setConfiguration(sfProjectConfiguration $configuration = null)
     /**
      * Returns the filesystem instance.
      *
-     * @return sfFilesystem A sfFilesystem instance
+     * @return \sfFilesystem A sfFilesystem instance
      */
     public function getFilesystem()
     {
         if (!isset($this->filesystem)) {
             if ($this->isVerbose()) {
-                $this->filesystem = new sfFilesystem($this->dispatcher, $this->formatter);
+                $this->filesystem = new \sfFilesystem($this->dispatcher, $this->formatter);
             } else {
-                $this->filesystem = new sfFilesystem();
+                $this->filesystem = new \sfFilesystem();
             }
         }
 
@@ -54,12 +55,12 @@ public function getFilesystem()
      *
      * @return true if the current directory is a symfony project directory, false otherwise
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function checkProjectExists()
     {
         if (!file_exists('symfony')) {
-            throw new sfException('You must be in a symfony project directory.');
+            throw new \sfException('You must be in a symfony project directory.');
         }
     }
 
@@ -70,12 +71,12 @@ public function checkProjectExists()
      *
      * @return bool true if the application exists, false otherwise
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function checkAppExists($app)
     {
-        if (!is_dir(sfConfig::get('sf_apps_dir').'/'.$app)) {
-            throw new sfException(sprintf('Application "%s" does not exist', $app));
+        if (!is_dir(\sfConfig::get('sf_apps_dir').'/'.$app)) {
+            throw new \sfException(sprintf('Application "%s" does not exist', $app));
         }
     }
 
@@ -87,26 +88,26 @@ public function checkAppExists($app)
      *
      * @return bool true if the module exists, false otherwise
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function checkModuleExists($app, $module)
     {
-        if (!is_dir(sfConfig::get('sf_apps_dir').'/'.$app.'/modules/'.$module)) {
-            throw new sfException(sprintf('Module "%s/%s" does not exist.', $app, $module));
+        if (!is_dir(\sfConfig::get('sf_apps_dir').'/'.$app.'/modules/'.$module)) {
+            throw new \sfException(sprintf('Module "%s/%s" does not exist.', $app, $module));
         }
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function doRun(sfCommandManager $commandManager, $options)
+    protected function doRun(\sfCommandManager $commandManager, $options)
     {
-        $event = $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('command_manager' => $commandManager)), $options);
+        $event = $this->dispatcher->filter(new \sfEvent($this, 'command.filter_options', ['command_manager' => $commandManager]), $options);
         $options = $event->getReturnValue();
 
         $this->process($commandManager, $options);
 
-        $event = new sfEvent($this, 'command.pre_command', array('arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()));
+        $event = new \sfEvent($this, 'command.pre_command', ['arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()]);
         $this->dispatcher->notifyUntil($event);
         if ($event->isProcessed()) {
             return $event->getReturnValue();
@@ -115,7 +116,7 @@ protected function doRun(sfCommandManager $commandManager, $options)
         $this->checkProjectExists();
 
         $requiresApplication = $commandManager->getArgumentSet()->hasArgument('application') || $commandManager->getOptionSet()->hasOption('application');
-        if (null === $this->configuration || ($requiresApplication && !$this->configuration instanceof sfApplicationConfiguration)) {
+        if (null === $this->configuration || ($requiresApplication && !$this->configuration instanceof \sfApplicationConfiguration)) {
             $application = $commandManager->getArgumentSet()->hasArgument('application') ? $commandManager->getArgumentValue('application') : ($commandManager->getOptionSet()->hasOption('application') ? $commandManager->getOptionValue('application') : null);
             $env = $commandManager->getOptionSet()->hasOption('env') ? $commandManager->getOptionValue('env') : 'test';
 
@@ -131,12 +132,12 @@ protected function doRun(sfCommandManager $commandManager, $options)
         }
 
         if (!$this->withTrace()) {
-            sfConfig::set('sf_logging_enabled', false);
+            \sfConfig::set('sf_logging_enabled', false);
         }
 
         $ret = $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
 
-        $this->dispatcher->notify(new sfEvent($this, 'command.post_command'));
+        $this->dispatcher->notify(new \sfEvent($this, 'command.post_command'));
 
         return $ret;
     }
@@ -189,26 +190,26 @@ protected function isDebug()
      * @param string $application The application name
      * @param string $env         The environment name
      *
-     * @return sfProjectConfiguration A sfProjectConfiguration instance
+     * @return \sfProjectConfiguration A sfProjectConfiguration instance
      */
     protected function createConfiguration($application, $env)
     {
         if (null !== $application) {
             $this->checkAppExists($application);
 
-            require_once sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
+            require_once \sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
 
-            $configuration = ProjectConfiguration::getApplicationConfiguration($application, $env, $this->isDebug(), null, $this->dispatcher);
+            $configuration = \ProjectConfiguration::getApplicationConfiguration($application, $env, $this->isDebug(), null, $this->dispatcher);
         } else {
-            if (file_exists(sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php')) {
-                require_once sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
-                $configuration = new ProjectConfiguration(null, $this->dispatcher);
+            if (file_exists(\sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php')) {
+                require_once \sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
+                $configuration = new \ProjectConfiguration(null, $this->dispatcher);
             } else {
-                $configuration = new sfProjectConfiguration(getcwd(), $this->dispatcher);
+                $configuration = new \sfProjectConfiguration(getcwd(), $this->dispatcher);
             }
 
             if (null !== $env) {
-                sfConfig::set('sf_environment', $env);
+                \sfConfig::set('sf_environment', $env);
             }
 
             $this->initializeAutoload($configuration);
@@ -224,7 +225,7 @@ protected function createConfiguration($application, $env)
      */
     protected function getFirstApplication()
     {
-        if (count($dirs = sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in(sfConfig::get('sf_apps_dir')))) {
+        if (count($dirs = \sfFinder::type('dir')->maxdepth(0)->follow_link()->relative()->in(\sfConfig::get('sf_apps_dir')))) {
             return $dirs[0];
         }
 
@@ -248,22 +249,22 @@ protected function reloadAutoload()
     /**
      * Initializes autoloaders.
      *
-     * @param sfProjectConfiguration $configuration The current project or application configuration
-     * @param bool                   $reload        If true, all autoloaders will be reloaded
+     * @param \sfProjectConfiguration $configuration The current project or application configuration
+     * @param bool                    $reload        If true, all autoloaders will be reloaded
      */
-    protected function initializeAutoload(sfProjectConfiguration $configuration, $reload = false)
+    protected function initializeAutoload(\sfProjectConfiguration $configuration, $reload = false)
     {
         // sfAutoload
         if ($reload) {
             $this->logSection('autoload', 'Resetting application autoloaders');
 
-            $finder = sfFinder::type('file')->name('*autoload.yml.php');
-            $this->getFilesystem()->remove($finder->in(sfConfig::get('sf_cache_dir')));
-            sfAutoload::getInstance()->reloadClasses(true);
+            $finder = \sfFinder::type('file')->name('*autoload.yml.php');
+            $this->getFilesystem()->remove($finder->in(\sfConfig::get('sf_cache_dir')));
+            \sfAutoload::getInstance()->reloadClasses(true);
         }
 
         // sfSimpleAutoload
-        if (!$configuration instanceof sfApplicationConfiguration) {
+        if (!$configuration instanceof \sfApplicationConfiguration) {
             // plugins
             if ($reload) {
                 foreach ($configuration->getPlugins() as $name) {
@@ -272,11 +273,11 @@ protected function initializeAutoload(sfProjectConfiguration $configuration, $re
             }
 
             // project
-            $autoload = sfSimpleAutoload::getInstance(sfConfig::get('sf_cache_dir').'/project_autoload.cache');
-            $autoload->loadConfiguration(sfFinder::type('file')->name('autoload.yml')->in(array(
-                sfConfig::get('sf_symfony_lib_dir').'/config/config',
-                sfConfig::get('sf_config_dir'),
-            )));
+            $autoload = \sfSimpleAutoload::getInstance(\sfConfig::get('sf_cache_dir').'/project_autoload.cache');
+            $autoload->loadConfiguration(\sfFinder::type('file')->name('autoload.yml')->in([
+                \sfConfig::get('sf_symfony_lib_dir').'/config/config',
+                \sfConfig::get('sf_config_dir'),
+            ]));
             $autoload->register();
 
             if ($reload) {
@@ -289,16 +290,16 @@ protected function initializeAutoload(sfProjectConfiguration $configuration, $re
     /**
      * Mirrors a directory structure inside the created project.
      *
-     * @param string   $dir    The directory to mirror
-     * @param sfFinder $finder A sfFinder instance to use for the mirroring
+     * @param string    $dir    The directory to mirror
+     * @param \sfFinder $finder A sfFinder instance to use for the mirroring
      */
     protected function installDir($dir, $finder = null)
     {
         if (null === $finder) {
-            $finder = sfFinder::type('any')->discard('.sf');
+            $finder = \sfFinder::type('any')->discard('.sf');
         }
 
-        $this->getFilesystem()->mirror($dir, sfConfig::get('sf_root_dir'), $finder);
+        $this->getFilesystem()->mirror($dir, \sfConfig::get('sf_root_dir'), $finder);
     }
 
     /**
@@ -311,15 +312,15 @@ protected function installDir($dir, $finder = null)
      * @param array $dirs   An array of directory where to do the replacement
      * @param array $tokens An array of tokens to use
      */
-    protected function replaceTokens($dirs = array(), $tokens = array())
+    protected function replaceTokens($dirs = [], $tokens = [])
     {
         if (!$dirs) {
-            $dirs = array(sfConfig::get('sf_config_dir'), sfConfig::get('sf_lib_dir'));
+            $dirs = [\sfConfig::get('sf_config_dir'), \sfConfig::get('sf_lib_dir')];
         }
 
-        $tokens = array_merge(isset($this->tokens) ? $this->tokens : array(), $tokens);
+        $tokens = array_merge(isset($this->tokens) ? $this->tokens : [], $tokens);
 
-        $this->getFilesystem()->replaceTokens(sfFinder::type('file')->prune('vendor')->in($dirs), '##', '##', $tokens);
+        $this->getFilesystem()->replaceTokens(\sfFinder::type('file')->prune('vendor')->in($dirs), '##', '##', $tokens);
     }
 
     /**
@@ -339,9 +340,9 @@ protected function reloadTasks()
         $this->commandApplication->loadTasks($this->configuration);
 
         $disabledPluginsRegex = sprintf('#^(%s)#', implode('|', array_diff($this->configuration->getAllPluginPaths(), $this->configuration->getPluginPaths())));
-        $tasks = array();
+        $tasks = [];
         foreach (get_declared_classes() as $class) {
-            $r = new ReflectionClass($class);
+            $r = new \ReflectionClass($class);
             if ($r->isSubclassOf('sfTask') && !$r->isAbstract() && !preg_match($disabledPluginsRegex, $r->getFileName())) {
                 $tasks[] = new $class($this->dispatcher, $this->formatter);
             }
@@ -357,7 +358,7 @@ protected function reloadTasks()
      */
     protected function enablePlugin($plugin)
     {
-        sfSymfonyPluginManager::enablePlugin($plugin, sfConfig::get('sf_config_dir'));
+        \sfSymfonyPluginManager::enablePlugin($plugin, \sfConfig::get('sf_config_dir'));
     }
 
     /**
@@ -367,38 +368,38 @@ protected function enablePlugin($plugin)
      */
     protected function disablePlugin($plugin)
     {
-        sfSymfonyPluginManager::disablePlugin($plugin, sfConfig::get('sf_config_dir'));
+        \sfSymfonyPluginManager::disablePlugin($plugin, \sfConfig::get('sf_config_dir'));
     }
 
     /**
      * Returns a plugin manager instance.
      *
-     * @return sfSymfonyPluginManager A sfSymfonyPluginManager instance
+     * @return \sfSymfonyPluginManager A sfSymfonyPluginManager instance
      */
     protected function getPluginManager()
     {
         if (null === $this->pluginManager) {
-            $environment = new sfPearEnvironment($this->dispatcher, array(
-                'plugin_dir' => sfConfig::get('sf_plugins_dir'),
-                'cache_dir' => sfConfig::get('sf_cache_dir').'/.pear',
-                'web_dir' => sfConfig::get('sf_web_dir'),
-                'config_dir' => sfConfig::get('sf_config_dir'),
-            ));
-
-            $this->pluginManager = new sfSymfonyPluginManager($this->dispatcher, $environment);
+            $environment = new \sfPearEnvironment($this->dispatcher, [
+                'plugin_dir' => \sfConfig::get('sf_plugins_dir'),
+                'cache_dir' => \sfConfig::get('sf_cache_dir').'/.pear',
+                'web_dir' => \sfConfig::get('sf_web_dir'),
+                'config_dir' => \sfConfig::get('sf_config_dir'),
+            ]);
+
+            $this->pluginManager = new \sfSymfonyPluginManager($this->dispatcher, $environment);
         }
 
         return $this->pluginManager;
     }
 
     /**
-     * @see sfCommandApplicationTask
+     * @see \sfCommandApplicationTask
      */
     protected function createTask($name)
     {
         $task = parent::createTask($name);
 
-        if ($task instanceof sfBaseTask) {
+        if ($task instanceof \sfBaseTask) {
             $task->setConfiguration($this->configuration);
         }
 
diff --git a/lib/task/sfCommandApplicationTask.class.php b/lib/task/sfCommandApplicationTask.class.php
index bf3c23635..2dd8d7f0d 100644
--- a/lib/task/sfCommandApplicationTask.class.php
+++ b/lib/task/sfCommandApplicationTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,35 +16,35 @@
  *
  * @version    SVN: $Id$
  *
- * @property sfApplicationConfiguration $configuration
+ * @property \sfApplicationConfiguration $configuration
  */
-abstract class sfCommandApplicationTask extends sfTask
+abstract class sfCommandApplicationTask extends \sfTask
 {
-    /** @var sfSymfonyCommandApplication */
+    /** @var \sfSymfonyCommandApplication */
     protected $commandApplication;
 
-    /** @var sfMailer */
+    /** @var \sfMailer */
     private $mailer;
 
-    /** @var sfRouting */
+    /** @var \sfRouting */
     private $routing;
 
-    /** @var sfServiceContainer */
+    /** @var \sfServiceContainer */
     private $serviceContainer;
     private $factoryConfiguration;
 
     /**
      * Sets the command application instance for this task.
      *
-     * @param sfCommandApplication $commandApplication A sfCommandApplication instance
+     * @param \sfCommandApplication $commandApplication A sfCommandApplication instance
      */
-    public function setCommandApplication(sfCommandApplication $commandApplication = null)
+    public function setCommandApplication(\sfCommandApplication $commandApplication = null)
     {
         $this->commandApplication = $commandApplication;
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     public function log($messages)
     {
@@ -53,9 +54,9 @@ public function log($messages)
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      *
-     * @param mixed|null $size
+     * @param \mixed|null $size
      */
     public function logSection($section, $message, $size = null, $style = 'INFO')
     {
@@ -81,19 +82,19 @@ public function getService($id)
      *
      * @param string $name The name of the task
      *
-     * @return sfTask
+     * @return \sfTask
      *
-     * @throws LogicException If the current task has no command application
+     * @throws \LogicException If the current task has no command application
      */
     protected function createTask($name)
     {
         if (null === $this->commandApplication) {
-            throw new LogicException('Unable to create a task as no command application is associated with this task yet.');
+            throw new \LogicException('Unable to create a task as no command application is associated with this task yet.');
         }
 
         $task = $this->commandApplication->getTaskToExecute($name);
 
-        if ($task instanceof sfCommandApplicationTask) {
+        if ($task instanceof \sfCommandApplicationTask) {
             $task->setCommandApplication($this->commandApplication);
         }
 
@@ -111,7 +112,7 @@ protected function createTask($name)
      *
      * @see createTask()
      */
-    protected function runTask($name, $arguments = array(), $options = array())
+    protected function runTask($name, $arguments = [], $options = [])
     {
         return $this->createTask($name)->run($arguments, $options);
     }
@@ -124,7 +125,7 @@ protected function runTask($name, $arguments = array(), $options = array())
      * instance, which is automatically created according to the current
      * --application option.
      *
-     * @return sfMailer A sfMailer instance
+     * @return \sfMailer A sfMailer instance
      */
     protected function getMailer()
     {
@@ -138,12 +139,12 @@ protected function getMailer()
     /**
      * Initialize mailer.
      *
-     * @return sfMailer A sfMailer instance
+     * @return \sfMailer A sfMailer instance
      */
     protected function initializeMailer()
     {
         if (!class_exists('Swift')) {
-            $swift_dir = sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib';
+            $swift_dir = \sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib';
 
             require_once $swift_dir.'/swift_required.php';
         }
@@ -161,7 +162,7 @@ protected function initializeMailer()
      * instance, which is automatically created according to the current
      * --application option.
      *
-     * @return sfRouting A sfRouting instance
+     * @return \sfRouting A sfRouting instance
      */
     protected function getRouting()
     {
@@ -175,21 +176,21 @@ protected function getRouting()
     /**
      * Initialize routing.
      *
-     * @return sfRouting A sfRouting instance
+     * @return \sfRouting A sfRouting instance
      */
     protected function initializeRouting()
     {
         $config = $this->getFactoryConfiguration();
-        $params = array_merge($config['routing']['param'], array('load_configuration' => false, 'logging' => false));
+        $params = array_merge($config['routing']['param'], ['load_configuration' => false, 'logging' => false]);
 
-        $handler = new sfRoutingConfigHandler();
+        $handler = new \sfRoutingConfigHandler();
         $routes = $handler->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
 
-        /** @var sfRouting $routing */
+        /** @var \sfRouting $routing */
         $routing = new $config['routing']['class']($this->dispatcher, null, $params);
         $routing->setRoutes($routes);
 
-        $this->dispatcher->notify(new sfEvent($routing, 'routing.load_configuration'));
+        $this->dispatcher->notify(new \sfEvent($routing, 'routing.load_configuration'));
 
         return $routing;
     }
@@ -202,7 +203,7 @@ protected function initializeRouting()
      * instance, which is automatically created according to the current
      * --application option.
      *
-     * @return sfServiceContainer An application service container
+     * @return \sfServiceContainer An application service container
      */
     protected function getServiceContainer()
     {
@@ -226,7 +227,7 @@ protected function getServiceContainer()
     protected function getFactoryConfiguration()
     {
         if (null === $this->factoryConfiguration) {
-            $this->factoryConfiguration = sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
+            $this->factoryConfiguration = \sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
         }
 
         return $this->factoryConfiguration;
diff --git a/lib/task/sfFilesystem.class.php b/lib/task/sfFilesystem.class.php
index 75288b352..474f01194 100644
--- a/lib/task/sfFilesystem.class.php
+++ b/lib/task/sfFilesystem.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,10 +24,10 @@ class sfFilesystem
     /**
      * Constructor.
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param sfFormatter       $formatter  An sfFormatter instance
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param \sfFormatter       $formatter  An sfFormatter instance
      */
-    public function __construct(sfEventDispatcher $dispatcher = null, sfFormatter $formatter = null)
+    public function __construct(\sfEventDispatcher $dispatcher = null, \sfFormatter $formatter = null)
     {
         $this->dispatcher = $dispatcher;
         $this->formatter = $formatter;
@@ -47,7 +48,7 @@ public function __construct(sfEventDispatcher $dispatcher = null, sfFormatter $f
      *
      * @return bool
      */
-    public function copy($originFile, $targetFile, $options = array())
+    public function copy($originFile, $targetFile, $options = [])
     {
         if (!array_key_exists('override', $options)) {
             $options['override'] = false;
@@ -101,7 +102,7 @@ public function mkdirs($path, $mode = 0777)
     public function touch($files)
     {
         if (!is_array($files)) {
-            $files = array($files);
+            $files = [$files];
         }
 
         foreach ($files as $file) {
@@ -119,7 +120,7 @@ public function touch($files)
     public function remove($files)
     {
         if (!is_array($files)) {
-            $files = array($files);
+            $files = [$files];
         }
 
         $files = array_reverse($files);
@@ -149,7 +150,7 @@ public function chmod($files, $mode, $umask = 0000)
         umask($umask);
 
         if (!is_array($files)) {
-            $files = array($files);
+            $files = [$files];
         }
 
         foreach ($files as $file) {
@@ -168,13 +169,13 @@ public function chmod($files, $mode, $umask = 0000)
      *
      * @return bool
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public function rename($origin, $target)
     {
         // we check that target does not exist
         if (is_readable($target)) {
-            throw new sfException(sprintf('Cannot rename because the target "%s" already exist.', $target));
+            throw new \sfException(sprintf('Cannot rename because the target "%s" already exist.', $target));
         }
 
         $this->logSection('rename', $origin.' > '.$target);
@@ -192,7 +193,7 @@ public function rename($origin, $target)
     public function symlink($originDir, $targetDir, $copyOnWindows = false)
     {
         if ('\\' == DIRECTORY_SEPARATOR && $copyOnWindows) {
-            $finder = sfFinder::type('any');
+            $finder = \sfFinder::type('any');
             $this->mirror($originDir, $targetDir, $finder);
 
             return;
@@ -232,14 +233,14 @@ public function relativeSymlink($originDir, $targetDir, $copyOnWindows = false)
     /**
      * Mirrors a directory to another.
      *
-     * @param string   $originDir The origin directory
-     * @param string   $targetDir The target directory
-     * @param sfFinder $finder    An sfFinder instance
-     * @param array    $options   An array of options (see copy())
+     * @param string    $originDir The origin directory
+     * @param string    $targetDir The target directory
+     * @param \sfFinder $finder    An sfFinder instance
+     * @param array     $options   An array of options (see copy())
      *
-     * @throws sfException
+     * @throws \sfException
      */
-    public function mirror($originDir, $targetDir, $finder, $options = array())
+    public function mirror($originDir, $targetDir, $finder, $options = [])
     {
         foreach ($finder->relative()->in($originDir) as $file) {
             if (is_dir($originDir.DIRECTORY_SEPARATOR.$file)) {
@@ -249,7 +250,7 @@ public function mirror($originDir, $targetDir, $finder, $options = array())
             } elseif (is_link($originDir.DIRECTORY_SEPARATOR.$file)) {
                 $this->symlink($originDir.DIRECTORY_SEPARATOR.$file, $targetDir.DIRECTORY_SEPARATOR.$file);
             } else {
-                throw new sfException(sprintf('Unable to guess "%s" file type.', $file));
+                throw new \sfException(sprintf('Unable to guess "%s" file type.', $file));
             }
         }
     }
@@ -267,14 +268,14 @@ public function execute($cmd, $stdoutCallback = null, $stderrCallback = null)
     {
         $this->logSection('exec ', $cmd);
 
-        $descriptorspec = array(
-            1 => array('pipe', 'w'), // stdout
-            2 => array('pipe', 'w'), // stderr
-        );
+        $descriptorspec = [
+            1 => ['pipe', 'w'], // stdout
+            2 => ['pipe', 'w'], // stderr
+        ];
 
         $process = proc_open($cmd, $descriptorspec, $pipes);
         if (!is_resource($process)) {
-            throw new RuntimeException('Unable to execute the command.');
+            throw new \RuntimeException('Unable to execute the command.');
         }
 
         stream_set_blocking($pipes[1], false);
@@ -310,10 +311,10 @@ public function execute($cmd, $stdoutCallback = null, $stderrCallback = null)
         fclose($pipes[2]);
 
         if (($return = proc_close($process)) > 0) {
-            throw new RuntimeException('Problem executing command.', $return);
+            throw new \RuntimeException('Problem executing command.', $return);
         }
 
-        return array($output, $err);
+        return [$output, $err];
     }
 
     /**
@@ -327,7 +328,7 @@ public function execute($cmd, $stdoutCallback = null, $stderrCallback = null)
     public function replaceTokens($files, $beginToken, $endToken, $tokens)
     {
         if (!is_array($files)) {
-            $files = array($files);
+            $files = [$files];
         }
 
         foreach ($files as $file) {
@@ -357,7 +358,7 @@ protected function logSection($section, $message, $size = null)
 
         $message = $this->formatter ? $this->formatter->formatSection($section, $message, $size) : $section.' '.$message."\n";
 
-        $this->dispatcher->notify(new sfEvent($this, 'command.log', array($message)));
+        $this->dispatcher->notify(new \sfEvent($this, 'command.log', [$message]));
     }
 
     /**
@@ -419,7 +420,7 @@ protected function canonicalizePath($path)
             return '';
         }
 
-        $out = array();
+        $out = [];
         foreach (explode(DIRECTORY_SEPARATOR, $path) as $i => $fold) {
             if ('' == $fold || '.' == $fold) {
                 continue;
diff --git a/lib/task/sfTask.class.php b/lib/task/sfTask.class.php
index c91842d0c..188c17506 100644
--- a/lib/task/sfTask.class.php
+++ b/lib/task/sfTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,25 +20,25 @@ abstract class sfTask
 {
     protected $namespace = '';
     protected $name;
-    protected $aliases = array();
+    protected $aliases = [];
     protected $briefDescription = '';
     protected $detailedDescription = '';
-    protected $arguments = array();
-    protected $options = array();
+    protected $arguments = [];
+    protected $options = [];
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
-    /** @var sfFormatter */
+    /** @var \sfFormatter */
     protected $formatter;
 
     /**
      * Constructor.
      *
-     * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
-     * @param sfFormatter       $formatter  An sfFormatter instance
+     * @param \sfEventDispatcher $dispatcher An sfEventDispatcher instance
+     * @param \sfFormatter       $formatter  An sfFormatter instance
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter)
+    public function __construct(\sfEventDispatcher $dispatcher, \sfFormatter $formatter)
     {
         $this->initialize($dispatcher, $formatter);
 
@@ -47,10 +48,10 @@ public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatte
     /**
      * Initializes the sfTask instance.
      *
-     * @param sfEventDispatcher $dispatcher A sfEventDispatcher instance
-     * @param sfFormatter       $formatter  A sfFormatter instance
+     * @param \sfEventDispatcher $dispatcher A sfEventDispatcher instance
+     * @param \sfFormatter       $formatter  A sfFormatter instance
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfFormatter $formatter)
+    public function initialize(\sfEventDispatcher $dispatcher, \sfFormatter $formatter)
     {
         $this->dispatcher = $dispatcher;
         $this->formatter = $formatter;
@@ -59,7 +60,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfFormatter $formatter
     /**
      * Returns the formatter instance.
      *
-     * @return sfFormatter The formatter instance
+     * @return \sfFormatter The formatter instance
      */
     public function getFormatter()
     {
@@ -69,9 +70,9 @@ public function getFormatter()
     /**
      * Sets the formatter instance.
      *
-     * @param sfFormatter $formatter The formatter instance
+     * @param \sfFormatter $formatter The formatter instance
      */
-    public function setFormatter(sfFormatter $formatter)
+    public function setFormatter(\sfFormatter $formatter)
     {
         $this->formatter = $formatter;
     }
@@ -79,12 +80,12 @@ public function setFormatter(sfFormatter $formatter)
     /**
      * Runs the task from the CLI.
      *
-     * @param sfCommandManager $commandManager An sfCommandManager instance
-     * @param mixed            $options        The command line options
+     * @param \sfCommandManager $commandManager An sfCommandManager instance
+     * @param mixed             $options        The command line options
      *
      * @return int 0 if everything went fine, or an error code
      */
-    public function runFromCLI(sfCommandManager $commandManager, $options = null)
+    public function runFromCLI(\sfCommandManager $commandManager, $options = null)
     {
         $commandManager->getArgumentSet()->addArguments($this->getArguments());
         $commandManager->getOptionSet()->addOptions($this->getOptions());
@@ -100,13 +101,13 @@ public function runFromCLI(sfCommandManager $commandManager, $options = null)
      *
      * @return int 0 if everything went fine, or an error code
      */
-    public function run($arguments = array(), $options = array())
+    public function run($arguments = [], $options = [])
     {
-        $commandManager = new sfCommandManager(new sfCommandArgumentSet($this->getArguments()), new sfCommandOptionSet($this->getOptions()));
+        $commandManager = new \sfCommandManager(new \sfCommandArgumentSet($this->getArguments()), new \sfCommandOptionSet($this->getOptions()));
 
         if (is_array($arguments) && is_string(key($arguments))) {
             // index arguments by name for ordering and reference
-            $indexArguments = array();
+            $indexArguments = [];
             foreach ($this->arguments as $argument) {
                 $indexArguments[$argument->getName()] = $argument;
             }
@@ -128,7 +129,7 @@ public function run($arguments = array(), $options = array())
         }
 
         // index options by name for reference
-        $indexedOptions = array();
+        $indexedOptions = [];
         foreach ($this->options as $option) {
             $indexedOptions[$option->getName()] = $option;
         }
@@ -146,7 +147,7 @@ public function run($arguments = array(), $options = array())
             }
 
             // add -- before each option if needed
-            if (0 !== strpos($value, '--')) {
+            if (!str_starts_with($value, '--')) {
                 $value = '--'.$value;
             }
 
@@ -184,14 +185,14 @@ public function addArguments($arguments)
      *
      * @see sfCommandArgument::__construct()
      *
-     * @param string     $name
-     * @param int        $mode
-     * @param string     $help
-     * @param mixed|null $default
+     * @param string      $name
+     * @param int         $mode
+     * @param string      $help
+     * @param \mixed|null $default
      */
     public function addArgument($name, $mode = null, $help = '', $default = null)
     {
-        $this->arguments[] = new sfCommandArgument($name, $mode, $help, $default);
+        $this->arguments[] = new \sfCommandArgument($name, $mode, $help, $default);
     }
 
     /**
@@ -221,15 +222,15 @@ public function addOptions($options)
      *
      * @see sfCommandOption::__construct()
      *
-     * @param string     $name
-     * @param string     $shortcut
-     * @param int        $mode
-     * @param string     $help
-     * @param mixed|null $default
+     * @param string      $name
+     * @param string      $shortcut
+     * @param int         $mode
+     * @param string      $help
+     * @param \mixed|null $default
      */
     public function addOption($name, $shortcut = null, $mode = null, $help = '', $default = null)
     {
-        $this->options[] = new sfCommandOption($name, $shortcut, $mode, $help, $default);
+        $this->options[] = new \sfCommandOption($name, $shortcut, $mode, $help, $default);
     }
 
     /**
@@ -263,7 +264,7 @@ public function getName()
             $name = substr($name, 0, -4);
         }
 
-        return str_replace('_', '-', sfInflector::underscore($name));
+        return str_replace('_', '-', \sfInflector::underscore($name));
     }
 
     /**
@@ -320,13 +321,13 @@ public function getAliases()
      */
     public function getSynopsis()
     {
-        $options = array();
+        $options = [];
         foreach ($this->getOptions() as $option) {
             $shortcut = $option->getShortcut() ? sprintf('-%s|', $option->getShortcut()) : '';
             $options[] = sprintf('['.($option->isParameterRequired() ? '%s--%s="..."' : ($option->isParameterOptional() ? '%s--%s[="..."]' : '%s--%s')).']', $shortcut, $option->getName());
         }
 
-        $arguments = array();
+        $arguments = [];
         foreach ($this->getArguments() as $argument) {
             $arguments[] = sprintf($argument->isRequired() ? '%s' : '[%s]', $argument->getName().($argument->isArray() ? '1' : ''));
 
@@ -346,10 +347,10 @@ public function getSynopsis()
     public function log($messages)
     {
         if (!is_array($messages)) {
-            $messages = array($messages);
+            $messages = [$messages];
         }
 
-        $this->dispatcher->notify(new sfEvent($this, 'command.log', $messages));
+        $this->dispatcher->notify(new \sfEvent($this, 'command.log', $messages));
     }
 
     /**
@@ -362,7 +363,7 @@ public function log($messages)
      */
     public function logSection($section, $message, $size = null, $style = 'INFO')
     {
-        $this->dispatcher->notify(new sfEvent($this, 'command.log', array($this->formatter->formatSection($section, $message, $size, $style))));
+        $this->dispatcher->notify(new \sfEvent($this, 'command.log', [$this->formatter->formatSection($section, $message, $size, $style)]));
     }
 
     /**
@@ -374,20 +375,20 @@ public function logSection($section, $message, $size = null, $style = 'INFO')
     public function logBlock($messages, $style)
     {
         if (!is_array($messages)) {
-            $messages = array($messages);
+            $messages = [$messages];
         }
 
         $style = str_replace('_LARGE', '', $style, $count);
         $large = (bool) $count;
 
         $len = 0;
-        $lines = array();
+        $lines = [];
         foreach ($messages as $message) {
             $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
             $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
         }
 
-        $messages = $large ? array(str_repeat(' ', $len)) : array();
+        $messages = $large ? [str_repeat(' ', $len)] : [];
         foreach ($lines as $line) {
             $messages[] = $line.str_repeat(' ', $len - $this->strlen($line));
         }
@@ -436,7 +437,7 @@ public function ask($question, $style = 'QUESTION', $default = null)
     public function askConfirmation($question, $style = 'QUESTION', $default = true)
     {
         $answer = 'z';
-        while ($answer && !in_array(strtolower($answer[0]), array('y', 'n'))) {
+        while ($answer && !in_array(strtolower($answer[0]), ['y', 'n'])) {
             $answer = $this->ask($question, $style);
         }
 
@@ -458,30 +459,30 @@ public function askConfirmation($question, $style = 'QUESTION', $default = true)
      *
      * @param array|string $question
      *
-     * @throws sfValidatorError
+     * @throws \sfValidatorError
      */
-    public function askAndValidate($question, sfValidatorBase $validator, array $options = array())
+    public function askAndValidate($question, \sfValidatorBase $validator, array $options = [])
     {
         if (!is_array($question)) {
-            $question = array($question);
+            $question = [$question];
         }
 
-        $options = array_merge(array(
+        $options = array_merge([
             'value' => null,
             'attempts' => false,
             'style' => 'QUESTION',
-        ), $options);
+        ], $options);
 
         // does the provided value passes the validator?
         if ($options['value']) {
             try {
                 return $validator->clean($options['value']);
-            } catch (sfValidatorError $error) {
+            } catch (\sfValidatorError $error) {
             }
         }
 
         // no, ask the user for a valid user
-        /** @var sfValidatorError|null $error */
+        /** @var \sfValidatorError|null $error */
         $error = null;
         while (false === $options['attempts'] || $options['attempts']--) {
             if (null !== $error) {
@@ -492,7 +493,7 @@ public function askAndValidate($question, sfValidatorBase $validator, array $opt
 
             try {
                 return $validator->clean($value);
-            } catch (sfValidatorError $error) {
+            } catch (\sfValidatorError $error) {
             }
         }
 
@@ -506,7 +507,7 @@ public function askAndValidate($question, sfValidatorBase $validator, array $opt
      */
     public function asXml()
     {
-        $dom = new DOMDocument('1.0', 'UTF-8');
+        $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->formatOutput = true;
         $dom->appendChild($taskXML = $dom->createElement('task'));
         $taskXML->setAttribute('id', $this->getFullName());
@@ -521,7 +522,7 @@ public function asXml()
 
         $taskXML->appendChild($helpXML = $dom->createElement('help'));
         $help = $this->detailedDescription;
-        $help = str_replace(array('|COMMENT', '|INFO'), array('|strong', '|em'), $help);
+        $help = str_replace(['|COMMENT', '|INFO'], ['|strong', '|em'], $help);
         $help = preg_replace('/\[(.+?)\|(\w+)\]/s', '<$2>$1</$2>', $help);
         $helpXML->appendChild($dom->createTextNode(implode("\n ", explode("\n", $help))));
 
@@ -541,7 +542,7 @@ public function asXml()
             $helpXML->appendChild($dom->createTextNode($argument->getHelp()));
 
             $argumentXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-            $defaults = is_array($argument->getDefault()) ? $argument->getDefault() : ($argument->getDefault() ? array($argument->getDefault()) : array());
+            $defaults = is_array($argument->getDefault()) ? $argument->getDefault() : ($argument->getDefault() ? [$argument->getDefault()] : []);
             foreach ($defaults as $default) {
                 $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
                 $defaultXML->appendChild($dom->createTextNode($default));
@@ -561,7 +562,7 @@ public function asXml()
 
             if ($option->acceptParameter()) {
                 $optionXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-                $defaults = is_array($option->getDefault()) ? $option->getDefault() : ($option->getDefault() ? array($option->getDefault()) : array());
+                $defaults = is_array($option->getDefault()) ? $option->getDefault() : ($option->getDefault() ? [$option->getDefault()] : []);
                 foreach ($defaults as $default) {
                     $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
                     $defaultXML->appendChild($dom->createTextNode($default));
@@ -579,22 +580,22 @@ protected function configure()
     {
     }
 
-    protected function process(sfCommandManager $commandManager, $options)
+    protected function process(\sfCommandManager $commandManager, $options)
     {
         $commandManager->process($options);
         if (!$commandManager->isValid()) {
-            throw new sfCommandArgumentsException(sprintf("The execution of task \"%s\" failed.\n- %s", $this->getFullName(), implode("\n- ", $commandManager->getErrors())));
+            throw new \sfCommandArgumentsException(sprintf("The execution of task \"%s\" failed.\n- %s", $this->getFullName(), implode("\n- ", $commandManager->getErrors())));
         }
     }
 
-    protected function doRun(sfCommandManager $commandManager, $options)
+    protected function doRun(\sfCommandManager $commandManager, $options)
     {
-        $event = $this->dispatcher->filter(new sfEvent($this, 'command.filter_options', array('command_manager' => $commandManager)), $options);
+        $event = $this->dispatcher->filter(new \sfEvent($this, 'command.filter_options', ['command_manager' => $commandManager]), $options);
         $options = $event->getReturnValue();
 
         $this->process($commandManager, $options);
 
-        $event = new sfEvent($this, 'command.pre_command', array('arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()));
+        $event = new \sfEvent($this, 'command.pre_command', ['arguments' => $commandManager->getArgumentValues(), 'options' => $commandManager->getOptionValues()]);
         $this->dispatcher->notifyUntil($event);
         if ($event->isProcessed()) {
             return $event->getReturnValue();
@@ -602,7 +603,7 @@ protected function doRun(sfCommandManager $commandManager, $options)
 
         $ret = $this->execute($commandManager->getArgumentValues(), $commandManager->getOptionValues());
 
-        $this->dispatcher->notify(new sfEvent($this, 'command.post_command'));
+        $this->dispatcher->notify(new \sfEvent($this, 'command.post_command'));
 
         return $ret;
     }
@@ -615,7 +616,7 @@ protected function doRun(sfCommandManager $commandManager, $options)
      *
      * @return int 0 if everything went fine, or an error code
      */
-    abstract protected function execute($arguments = array(), $options = array());
+    abstract protected function execute($arguments = [], $options = []);
 
     protected function strlen($string)
     {
diff --git a/lib/task/symfony/lime_symfony.php b/lib/task/symfony/lime_symfony.php
index 7605c4cd9..85d939ac5 100644
--- a/lib/task/symfony/lime_symfony.php
+++ b/lib/task/symfony/lime_symfony.php
@@ -1,22 +1,23 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-class lime_symfony extends lime_harness
+class lime_symfony extends \lime_harness
 {
     protected function get_relative_file($file)
     {
-        $file = str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(
+        $file = str_replace(DIRECTORY_SEPARATOR, '/', str_replace([
             realpath($this->base_dir).DIRECTORY_SEPARATOR,
             realpath($this->base_dir.'/../lib/plugins').DIRECTORY_SEPARATOR,
             $this->extension,
-        ), '', $file));
+        ], '', $file));
 
         return preg_replace('#^(.*?)Plugin/test/(unit|functional)/#', '[$1] $2/', $file);
     }
diff --git a/lib/task/symfony/sfSymfonyTestTask.class.php b/lib/task/symfony/sfSymfonyTestTask.class.php
index 70065aca7..7d0cd7488 100644
--- a/lib/task/symfony/sfSymfonyTestTask.class.php
+++ b/lib/task/symfony/sfSymfonyTestTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,19 +16,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfSymfonyTestTask extends sfTask
+class sfSymfonyTestTask extends \sfTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('update-autoloader', 'u', sfCommandOption::PARAMETER_NONE, 'Update the sfCoreAutoload class'),
-            new sfCommandOption('only-failed', 'f', sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
-            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-            new sfCommandOption('rebuild-all', null, sfCommandOption::PARAMETER_NONE, 'Rebuild all generated fixture files'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('update-autoloader', 'u', \sfCommandOption::PARAMETER_NONE, 'Update the sfCoreAutoload class'),
+            new \sfCommandOption('only-failed', 'f', \sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
+            new \sfCommandOption('xml', null, \sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
+            new \sfCommandOption('rebuild-all', null, \sfCommandOption::PARAMETER_NONE, 'Rebuild all generated fixture files'),
+        ]);
 
         $this->namespace = 'symfony';
         $this->name = 'test';
@@ -41,9 +42,9 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         require_once __DIR__.'/../../vendor/lime/lime.php';
 
@@ -60,7 +61,7 @@ protected function execute($arguments = array(), $options = array())
         // update sfCoreAutoload
         if ($options['update-autoloader']) {
             require_once __DIR__.'/../../autoload/sfCoreAutoload.class.php';
-            sfCoreAutoload::make();
+            \sfCoreAutoload::make();
         }
 
         $status = false;
@@ -71,14 +72,14 @@ protected function execute($arguments = array(), $options = array())
             }
         }
 
-        $h = new lime_symfony(array('force_colors' => $options['color'], 'verbose' => $options['trace']));
+        $h = new \lime_symfony(['force_colors' => $options['color'], 'verbose' => $options['trace']]);
         $h->base_dir = realpath(__DIR__.'/../../../test');
 
         // remove generated files
         if ($options['rebuild-all']) {
-            $finder = sfFinder::type('dir')->name(array('base', 'om', 'map'));
+            $finder = \sfFinder::type('dir')->name(['base', 'om', 'map']);
             foreach ($finder->in(glob($h->base_dir.'/../lib/plugins/*/test/functional/fixtures/lib')) as $dir) {
-                sfToolkit::clearDirectory($dir);
+                \sfToolkit::clearDirectory($dir);
             }
         }
 
@@ -87,17 +88,17 @@ protected function execute($arguments = array(), $options = array())
                 $h->register($file);
             }
         } else {
-            $h->register(sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array_merge(
+            $h->register(\sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array_merge(
                 // unit tests
-                array($h->base_dir.'/unit'),
+                [$h->base_dir.'/unit'],
                 glob($h->base_dir.'/../lib/plugins/*/test/unit'),
 
                 // functional tests
-                array($h->base_dir.'/functional'),
+                [$h->base_dir.'/functional'],
                 glob($h->base_dir.'/../lib/plugins/*/test/functional'),
 
                 // other tests
-                array($h->base_dir.'/other')
+                [$h->base_dir.'/other']
             )));
         }
 
diff --git a/lib/task/test/sfLimeHarness.class.php b/lib/task/test/sfLimeHarness.class.php
index 226b818fa..81959cd62 100644
--- a/lib/task/test/sfLimeHarness.class.php
+++ b/lib/task/test/sfLimeHarness.class.php
@@ -1,10 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../../vendor/lime/lime.php';
 
-class sfLimeHarness extends lime_harness
+class sfLimeHarness extends \lime_harness
 {
-    protected $plugins = array();
+    protected $plugins = [];
 
     public function addPlugins($plugins)
     {
@@ -27,6 +36,6 @@ protected function get_relative_file($file)
             return $file;
         }
 
-        return str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(realpath($this->base_dir).DIRECTORY_SEPARATOR, $this->extension), '', $file));
+        return str_replace(DIRECTORY_SEPARATOR, '/', str_replace([realpath($this->base_dir).DIRECTORY_SEPARATOR, $this->extension], '', $file));
     }
 }
diff --git a/lib/task/test/sfTestAllTask.class.php b/lib/task/test/sfTestAllTask.class.php
index b3287c668..2ac646bb4 100644
--- a/lib/task/test/sfTestAllTask.class.php
+++ b/lib/task/test/sfTestAllTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,18 +16,18 @@
  *
  * @version    SVN: $Id$
  */
-class sfTestAllTask extends sfTestBaseTask
+class sfTestAllTask extends \sfTestBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('only-failed', 'f', sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
-            new sfCommandOption('full-output', 'o', sfCommandOption::PARAMETER_NONE, 'Display full path for the test'),
-            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('only-failed', 'f', \sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
+            new \sfCommandOption('full-output', 'o', \sfCommandOption::PARAMETER_NONE, 'Display full path for the test'),
+            new \sfCommandOption('xml', null, \sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
+        ]);
 
         $this->namespace = 'test';
         $this->name = 'all';
@@ -71,22 +72,22 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         require_once __DIR__.'/sfLimeHarness.class.php';
 
-        $h = new sfLimeHarness(array(
+        $h = new \sfLimeHarness([
             'force_colors' => isset($options['color']) && $options['color'],
             'verbose' => isset($options['trace']) && $options['trace'],
-        ));
+        ]);
         $h->full_output = $options['full-output'] ? true : false;
-        $h->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
-        $h->base_dir = sfConfig::get('sf_test_dir');
+        $h->addPlugins(array_map([$this->configuration, 'getPluginConfiguration'], $this->configuration->getPlugins()));
+        $h->base_dir = \sfConfig::get('sf_test_dir');
 
         $status = false;
-        $statusFile = sfConfig::get('sf_cache_dir').'/.test_all_status';
+        $statusFile = \sfConfig::get('sf_cache_dir').'/.test_all_status';
         if ($options['only-failed']) {
             if (file_exists($statusFile)) {
                 $status = unserialize(file_get_contents($statusFile));
@@ -99,7 +100,7 @@ protected function execute($arguments = array(), $options = array())
             }
         } else {
             // filter and register all tests
-            $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
+            $finder = \sfFinder::type('file')->follow_link()->name('*Test.php');
             $h->register($this->filterTestFiles($finder->in($h->base_dir), $arguments, $options));
         }
 
diff --git a/lib/task/test/sfTestBaseTask.class.php b/lib/task/test/sfTestBaseTask.class.php
index 43a4cecc8..8527fc4fd 100644
--- a/lib/task/test/sfTestBaseTask.class.php
+++ b/lib/task/test/sfTestBaseTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfTestBaseTask extends sfBaseTask
+abstract class sfTestBaseTask extends \sfBaseTask
 {
     /**
      * Filters tests through the "task.test.filter_test_files" event.
@@ -28,7 +29,7 @@ abstract class sfTestBaseTask extends sfBaseTask
      */
     protected function filterTestFiles($tests, $arguments, $options)
     {
-        $event = new sfEvent($this, 'task.test.filter_test_files', array('arguments' => $arguments, 'options' => $options));
+        $event = new \sfEvent($this, 'task.test.filter_test_files', ['arguments' => $arguments, 'options' => $options]);
 
         $this->dispatcher->filter($event, $tests);
 
@@ -48,10 +49,10 @@ protected function filterTestFiles($tests, $arguments, $options)
     protected function checkPluginExists($plugin)
     {
         try {
-            sfApplicationConfiguration::getActive()->getPluginConfiguration($plugin);
+            \sfApplicationConfiguration::getActive()->getPluginConfiguration($plugin);
 
             return true;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
     }
diff --git a/lib/task/test/sfTestCoverageTask.class.php b/lib/task/test/sfTestCoverageTask.class.php
index df4fcd9b5..eaae7d4ae 100644
--- a/lib/task/test/sfTestCoverageTask.class.php
+++ b/lib/task/test/sfTestCoverageTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,21 +16,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfTestCoverageTask extends sfBaseTask
+class sfTestCoverageTask extends \sfBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('test_name', sfCommandArgument::REQUIRED, 'A test file name or a test directory'),
-            new sfCommandArgument('lib_name', sfCommandArgument::REQUIRED, 'A lib file name or a lib directory for wich you want to know the coverage'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('test_name', \sfCommandArgument::REQUIRED, 'A test file name or a test directory'),
+            new \sfCommandArgument('lib_name', \sfCommandArgument::REQUIRED, 'A lib file name or a lib directory for wich you want to know the coverage'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('detailed', null, sfCommandOption::PARAMETER_NONE, 'Output detailed information'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('detailed', null, \sfCommandOption::PARAMETER_NONE, 'Output detailed information'),
+        ]);
 
         $this->namespace = 'test';
         $this->name = 'coverage';
@@ -50,41 +51,41 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
+        require_once \sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
 
-        $coverage = $this->getCoverage($this->getTestHarness(array('force_colors' => isset($options['color']) && $options['color'])), $options['detailed']);
+        $coverage = $this->getCoverage($this->getTestHarness(['force_colors' => isset($options['color']) && $options['color']]), $options['detailed']);
 
-        $testFiles = $this->getFiles(sfConfig::get('sf_root_dir').'/'.$arguments['test_name']);
+        $testFiles = $this->getFiles(\sfConfig::get('sf_root_dir').'/'.$arguments['test_name']);
         $max = count($testFiles);
         foreach ($testFiles as $i => $file) {
             $this->logSection('coverage', sprintf('running %s (%d/%d)', $file, $i + 1, $max));
             $coverage->process($file);
         }
 
-        $coveredFiles = $this->getFiles(sfConfig::get('sf_root_dir').'/'.$arguments['lib_name']);
+        $coveredFiles = $this->getFiles(\sfConfig::get('sf_root_dir').'/'.$arguments['lib_name']);
         $coverage->output($coveredFiles);
     }
 
-    protected function getTestHarness($harnessOptions = array())
+    protected function getTestHarness($harnessOptions = [])
     {
         require_once __DIR__.'/sfLimeHarness.class.php';
 
-        $harness = new sfLimeHarness($harnessOptions);
-        $harness->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
-        $harness->base_dir = sfConfig::get('sf_root_dir');
+        $harness = new \sfLimeHarness($harnessOptions);
+        $harness->addPlugins(array_map([$this->configuration, 'getPluginConfiguration'], $this->configuration->getPlugins()));
+        $harness->base_dir = \sfConfig::get('sf_root_dir');
 
         return $harness;
     }
 
-    protected function getCoverage(lime_harness $harness, $detailed = false)
+    protected function getCoverage(\lime_harness $harness, $detailed = false)
     {
-        $coverage = new lime_coverage($harness);
+        $coverage = new \lime_coverage($harness);
         $coverage->verbose = $detailed;
-        $coverage->base_dir = sfConfig::get('sf_root_dir');
+        $coverage->base_dir = \sfConfig::get('sf_root_dir');
 
         return $coverage;
     }
@@ -92,12 +93,12 @@ protected function getCoverage(lime_harness $harness, $detailed = false)
     protected function getFiles($directory)
     {
         if (is_dir($directory)) {
-            return sfFinder::type('file')->name('*.php')->in($directory);
+            return \sfFinder::type('file')->name('*.php')->in($directory);
         }
         if (file_exists($directory)) {
-            return array($directory);
+            return [$directory];
         }
 
-        throw new sfCommandException(sprintf('File or directory "%s" does not exist.', $directory));
+        throw new \sfCommandException(sprintf('File or directory "%s" does not exist.', $directory));
     }
 }
diff --git a/lib/task/test/sfTestFunctionalTask.class.php b/lib/task/test/sfTestFunctionalTask.class.php
index c3a78b382..d31b27d9a 100644
--- a/lib/task/test/sfTestFunctionalTask.class.php
+++ b/lib/task/test/sfTestFunctionalTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,21 +16,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfTestFunctionalTask extends sfTestBaseTask
+class sfTestFunctionalTask extends \sfTestBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-            new sfCommandArgument('controller', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'The controller name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('application', \sfCommandArgument::REQUIRED, 'The application name'),
+            new \sfCommandArgument('controller', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'The controller name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('xml', null, \sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
+        ]);
 
         $this->namespace = 'test';
         $this->name = 'functional';
@@ -65,18 +66,18 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $app = $arguments['application'];
 
         if (count($arguments['controller'])) {
-            $files = array();
+            $files = [];
 
             foreach ($arguments['controller'] as $controller) {
-                $finder = sfFinder::type('file')->follow_link()->name(basename($controller).'Test.php');
-                $files = array_merge($files, $finder->in(sfConfig::get('sf_test_dir').'/functional/'.$app.'/'.dirname($controller)));
+                $finder = \sfFinder::type('file')->follow_link()->name(basename($controller).'Test.php');
+                $files = array_merge($files, $finder->in(\sfConfig::get('sf_test_dir').'/functional/'.$app.'/'.dirname($controller)));
             }
 
             if ($allFiles = $this->filterTestFiles($files, $arguments, $options)) {
@@ -89,15 +90,15 @@ protected function execute($arguments = array(), $options = array())
         } else {
             require_once __DIR__.'/sfLimeHarness.class.php';
 
-            $h = new sfLimeHarness(array(
+            $h = new \sfLimeHarness([
                 'force_colors' => isset($options['color']) && $options['color'],
                 'verbose' => isset($options['trace']) && $options['trace'],
-            ));
-            $h->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
-            $h->base_dir = sfConfig::get('sf_test_dir').'/functional/'.$app;
+            ]);
+            $h->addPlugins(array_map([$this->configuration, 'getPluginConfiguration'], $this->configuration->getPlugins()));
+            $h->base_dir = \sfConfig::get('sf_test_dir').'/functional/'.$app;
 
             // filter and register functional tests
-            $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
+            $finder = \sfFinder::type('file')->follow_link()->name('*Test.php');
             $h->register($this->filterTestFiles($finder->in($h->base_dir), $arguments, $options));
 
             $ret = $h->run() ? 0 : 1;
diff --git a/lib/task/test/sfTestPluginTask.class.php b/lib/task/test/sfTestPluginTask.class.php
index c8422d405..217db1023 100644
--- a/lib/task/test/sfTestPluginTask.class.php
+++ b/lib/task/test/sfTestPluginTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,20 +16,20 @@
  *
  * @version     SVN: $Id$
  */
-class sfTestPluginTask extends sfTestBaseTask
+class sfTestPluginTask extends \sfTestBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('plugin', sfCommandArgument::REQUIRED, 'The plugin name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('plugin', \sfCommandArgument::REQUIRED, 'The plugin name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('only', null, sfCommandOption::PARAMETER_REQUIRED, 'Only run "unit" or "functional" tests'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('only', null, \sfCommandOption::PARAMETER_REQUIRED, 'Only run "unit" or "functional" tests'),
+        ]);
 
         $this->namespace = 'test';
         $this->name = 'plugin';
@@ -47,24 +48,24 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         if (false === $this->checkPluginExists($arguments['plugin'])) {
-            throw new sfCommandException(sprintf('The plugin "%s" does not exists', $arguments['plugin']));
+            throw new \sfCommandException(sprintf('The plugin "%s" does not exists', $arguments['plugin']));
         }
 
-        if ($options['only'] && !in_array($options['only'], array('unit', 'functional'))) {
-            throw new sfCommandException(sprintf('The --only option must be either "unit" or "functional" ("%s" given)', $options['only']));
+        if ($options['only'] && !in_array($options['only'], ['unit', 'functional'])) {
+            throw new \sfCommandException(sprintf('The --only option must be either "unit" or "functional" ("%s" given)', $options['only']));
         }
 
-        require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
+        require_once \sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
 
-        $h = new lime_harness(new lime_output_color());
-        $h->base_dir = sfConfig::get('sf_plugins_dir').'/'.$arguments['plugin'].'/test/'.$options['only'];
+        $h = new \lime_harness(new \lime_output_color());
+        $h->base_dir = \sfConfig::get('sf_plugins_dir').'/'.$arguments['plugin'].'/test/'.$options['only'];
 
-        $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
+        $finder = \sfFinder::type('file')->follow_link()->name('*Test.php');
         $h->register($finder->in($h->base_dir));
 
         $h->run();
diff --git a/lib/task/test/sfTestUnitTask.class.php b/lib/task/test/sfTestUnitTask.class.php
index 42a01e8f2..0ec1b8e0d 100644
--- a/lib/task/test/sfTestUnitTask.class.php
+++ b/lib/task/test/sfTestUnitTask.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,20 +16,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfTestUnitTask extends sfTestBaseTask
+class sfTestUnitTask extends \sfTestBaseTask
 {
     /**
-     * @see sfTask
+     * @see \sfTask
      */
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('name', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'The test name'),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('name', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, 'The test name'),
+        ]);
 
-        $this->addOptions(array(
-            new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('xml', null, \sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
+        ]);
 
         $this->namespace = 'test';
         $this->name = 'unit';
@@ -62,16 +63,16 @@ protected function configure()
     }
 
     /**
-     * @see sfTask
+     * @see \sfTask
      */
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         if (count($arguments['name'])) {
-            $files = array();
+            $files = [];
 
             foreach ($arguments['name'] as $name) {
-                $finder = sfFinder::type('file')->follow_link()->name(basename($name).'Test.php');
-                $files = array_merge($files, $finder->in(sfConfig::get('sf_test_dir').'/unit/'.dirname($name)));
+                $finder = \sfFinder::type('file')->follow_link()->name(basename($name).'Test.php');
+                $files = array_merge($files, $finder->in(\sfConfig::get('sf_test_dir').'/unit/'.dirname($name)));
             }
 
             if ($allFiles = $this->filterTestFiles($files, $arguments, $options)) {
@@ -84,16 +85,16 @@ protected function execute($arguments = array(), $options = array())
         } else {
             require_once __DIR__.'/sfLimeHarness.class.php';
 
-            $h = new sfLimeHarness(array(
+            $h = new \sfLimeHarness([
                 'force_colors' => isset($options['color']) && $options['color'],
                 'verbose' => isset($options['trace']) && $options['trace'],
-                'test_path' => sfConfig::get('sf_cache_dir').'/lime',
-            ));
-            $h->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
-            $h->base_dir = sfConfig::get('sf_test_dir').'/unit';
+                'test_path' => \sfConfig::get('sf_cache_dir').'/lime',
+            ]);
+            $h->addPlugins(array_map([$this->configuration, 'getPluginConfiguration'], $this->configuration->getPlugins()));
+            $h->base_dir = \sfConfig::get('sf_test_dir').'/unit';
 
             // filter and register unit tests
-            $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
+            $finder = \sfFinder::type('file')->follow_link()->name('*Test.php');
             $h->register($this->filterTestFiles($finder->in($h->base_dir), $arguments, $options));
 
             $ret = $h->run() ? 0 : 1;
diff --git a/lib/test/sfTestBrowser.class.php b/lib/test/sfTestBrowser.class.php
index 4ef73b4b0..9fbafb6b0 100644
--- a/lib/test/sfTestBrowser.class.php
+++ b/lib/test/sfTestBrowser.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../vendor/lime/lime.php';
 
 /*
@@ -20,7 +29,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTestBrowser extends sfTestFunctional
+class sfTestBrowser extends \sfTestFunctional
 {
     /**
      * Initializes the browser tester instance.
@@ -29,16 +38,16 @@ class sfTestBrowser extends sfTestFunctional
      * @param string $remote   Remote address to spook
      * @param array  $options  Options for sfBrowser
      */
-    public function __construct($hostname = null, $remote = null, $options = array())
+    public function __construct($hostname = null, $remote = null, $options = [])
     {
         if (is_object($hostname)) {
             // new signature
             parent::__construct($hostname, $remote);
         } else {
-            $browser = new sfBrowser($hostname, $remote, $options);
+            $browser = new \sfBrowser($hostname, $remote, $options);
 
             if (null === self::$test) {
-                $lime = new lime_test(null, isset($options['output']) ? $options['output'] : null);
+                $lime = new \lime_test(null, isset($options['output']) ? $options['output'] : null);
             } else {
                 $lime = null;
             }
diff --git a/lib/test/sfTestFunctional.class.php b/lib/test/sfTestFunctional.class.php
index a176cf774..519e1ae34 100644
--- a/lib/test/sfTestFunctional.class.php
+++ b/lib/test/sfTestFunctional.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,20 +16,20 @@
  *
  * @version    SVN: $Id$
  */
-class sfTestFunctional extends sfTestFunctionalBase
+class sfTestFunctional extends \sfTestFunctionalBase
 {
     /**
      * Initializes the browser tester instance.
      *
-     * @param sfBrowserBase $browser A sfBrowserBase instance
-     * @param lime_test     $lime    A lime instance
+     * @param \sfBrowserBase $browser A sfBrowserBase instance
+     * @param \lime_test     $lime    A lime instance
      */
-    public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
+    public function __construct(\sfBrowserBase $browser, \lime_test $lime = null, $testers = [])
     {
-        $testers = array_merge(array(
+        $testers = array_merge([
             'view_cache' => 'sfTesterViewCache',
             'form' => 'sfTesterForm',
-        ), $testers);
+        ], $testers);
 
         parent::__construct($browser, $lime, $testers);
     }
@@ -40,7 +41,7 @@ public function __construct(sfBrowserBase $browser, lime_test $lime = null, $tes
      * @param string $actionName The action name
      * @param mixed  $position   The position in the action stack (default to the last entry)
      *
-     * @return sfTestFunctional The current sfTestFunctional instance
+     * @return \sfTestFunctional The current sfTestFunctional instance
      */
     public function isForwardedTo($moduleName, $actionName, $position = 'last')
     {
diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php
index e9125d678..630637828 100644
--- a/lib/test/sfTestFunctionalBase.class.php
+++ b/lib/test/sfTestFunctionalBase.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../vendor/lime/lime.php';
 
 /*
@@ -19,7 +28,7 @@
  */
 abstract class sfTestFunctionalBase
 {
-    protected $testers = array();
+    protected $testers = [];
     protected $blockTester;
     protected $currentTester;
     protected $browser;
@@ -29,35 +38,35 @@ abstract class sfTestFunctionalBase
     /**
      * Initializes the browser tester instance.
      *
-     * @param sfBrowserBase $browser A sfBrowserBase instance
-     * @param lime_test     $lime    A lime instance
+     * @param \sfBrowserBase $browser A sfBrowserBase instance
+     * @param \lime_test     $lime    A lime instance
      */
-    public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
+    public function __construct(\sfBrowserBase $browser, \lime_test $lime = null, $testers = [])
     {
         $this->browser = $browser;
 
         if (null === self::$test) {
-            self::$test = null !== $lime ? $lime : new lime_test();
+            self::$test = null !== $lime ? $lime : new \lime_test();
         }
 
-        $this->setTesters(array_merge(array(
+        $this->setTesters(array_merge([
             'request' => 'sfTesterRequest',
             'response' => 'sfTesterResponse',
             'user' => 'sfTesterUser',
             'mailer' => 'sfTesterMailer',
-        ), $testers));
+        ], $testers));
 
         // register our shutdown function
-        register_shutdown_function(array($this, 'shutdown'));
+        register_shutdown_function([$this, 'shutdown']);
 
         // register our error/exception handlers
-        set_error_handler(array($this, 'handlePhpError'));
-        set_exception_handler(array($this, 'handleException'));
+        set_error_handler([$this, 'handlePhpError']);
+        set_exception_handler([$this, 'handleException']);
     }
 
     public function __call($method, $arguments)
     {
-        $retval = call_user_func_array(array($this->browser, $method), $arguments);
+        $retval = call_user_func_array([$this->browser, $method], $arguments);
 
         // fix the fluent interface
         return $retval === $this->browser ? $this : $retval;
@@ -67,16 +76,16 @@ public function __call($method, $arguments)
      * Returns the tester associated with the given name.
      *
      * @param string $name The tester name
-     * @param sfTester A sfTester instance
+     * @param \sfTester A sfTester instance
      */
     public function with($name)
     {
         if (!isset($this->testers[$name])) {
-            throw new InvalidArgumentException(sprintf('The "%s" tester does not exist.', $name));
+            throw new \InvalidArgumentException(sprintf('The "%s" tester does not exist.', $name));
         }
 
         if ($this->blockTester) {
-            throw new LogicException(sprintf('You cannot nest tester blocks.'));
+            throw new \LogicException(sprintf('You cannot nest tester blocks.'));
         }
 
         $this->currentTester = $this->testers[$name];
@@ -88,12 +97,12 @@ public function with($name)
     /**
      * Begins a block of test for the current tester.
      *
-     * @return sfTester The current sfTester instance
+     * @return \sfTester The current sfTester instance
      */
     public function begin()
     {
         if (!$this->currentTester) {
-            throw new LogicException(sprintf('You must call with() before beginning a tester block.'));
+            throw new \LogicException(sprintf('You must call with() before beginning a tester block.'));
         }
 
         return $this->blockTester = $this->currentTester;
@@ -102,12 +111,12 @@ public function begin()
     /**
      * End a block of test for the current tester.
      *
-     * @return sfTestFunctionalBase
+     * @return \sfTestFunctionalBase
      */
     public function end()
     {
         if (null === $this->blockTester) {
-            throw new LogicException(sprintf('There is no current tester block to end.'));
+            throw new \LogicException(sprintf('There is no current tester block to end.'));
         }
 
         $this->blockTester = null;
@@ -139,8 +148,8 @@ public function setTester($name, $tester)
             $tester = new $tester($this, self::$test);
         }
 
-        if (!$tester instanceof sfTester) {
-            throw new InvalidArgumentException(sprintf('The tester "%s" is not of class sfTester.', $name));
+        if (!$tester instanceof \sfTester) {
+            throw new \InvalidArgumentException(sprintf('The tester "%s" is not of class sfTester.', $name));
         }
 
         $this->testers[$name] = $tester;
@@ -157,7 +166,7 @@ public function shutdown()
     /**
      * Retrieves the lime_test instance.
      *
-     * @return lime_test The lime_test instance
+     * @return \lime_test The lime_test instance
      */
     public function test()
     {
@@ -171,9 +180,9 @@ public function test()
      * @param array  $parameters  The Request parameters
      * @param bool   $changeStack Change the browser history stack?
      *
-     * @return sfTestFunctionalBase
+     * @return \sfTestFunctionalBase
      */
-    public function get($uri, $parameters = array(), $changeStack = true)
+    public function get($uri, $parameters = [], $changeStack = true)
     {
         return $this->call($uri, 'get', $parameters, $changeStack);
     }
@@ -186,7 +195,7 @@ public function get($uri, $parameters = array(), $changeStack = true)
      * @param string $url    Url
      * @param string $code   The expected return status code
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
     public function getAndCheck($module, $action, $url = null, $code = 200)
     {
@@ -206,9 +215,9 @@ public function getAndCheck($module, $action, $url = null, $code = 200)
      * @param array  $parameters  The Request parameters
      * @param bool   $changeStack Change the browser history stack?
      *
-     * @return sfTestFunctionalBase
+     * @return \sfTestFunctionalBase
      */
-    public function post($uri, $parameters = array(), $changeStack = true)
+    public function post($uri, $parameters = [], $changeStack = true)
     {
         return $this->call($uri, 'post', $parameters, $changeStack);
     }
@@ -221,9 +230,9 @@ public function post($uri, $parameters = array(), $changeStack = true)
      * @param array  $parameters  Additional parameters
      * @param bool   $changeStack If set to false ActionStack is not changed
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
-    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    public function call($uri, $method = 'get', $parameters = [], $changeStack = true)
     {
         $this->checkCurrentExceptionIsEmpty();
 
@@ -245,7 +254,7 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
      *
      * @param string $name The checkbox or radiobutton id, name or text
      *
-     * @return sfTestFunctionalBase
+     * @return \sfTestFunctionalBase
      */
     public function deselect($name)
     {
@@ -259,7 +268,7 @@ public function deselect($name)
      *
      * @param string $name The checkbox or radiobutton id, name or text
      *
-     * @return sfTestFunctionalBase
+     * @return \sfTestFunctionalBase
      */
     public function select($name)
     {
@@ -275,16 +284,16 @@ public function select($name)
      * @param array  $arguments The arguments to pass to the link
      * @param array  $options   An array of options
      *
-     * @return sfTestFunctionalBase
+     * @return \sfTestFunctionalBase
      */
-    public function click($name, $arguments = array(), $options = array())
+    public function click($name, $arguments = [], $options = [])
     {
-        if ($name instanceof DOMElement) {
+        if ($name instanceof \DOMElement) {
             list($uri, $method, $parameters) = $this->doClickElement($name, $arguments, $options);
         } else {
             try {
                 list($uri, $method, $parameters) = $this->doClick($name, $arguments, $options);
-            } catch (InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 list($uri, $method, $parameters) = $this->doClickCssSelector($name, $arguments, $options);
             }
         }
@@ -295,7 +304,7 @@ public function click($name, $arguments = array(), $options = array())
     /**
      * Simulates the browser back button.
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
     public function back()
     {
@@ -309,7 +318,7 @@ public function back()
     /**
      * Simulates the browser forward button.
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
     public function forward()
     {
@@ -325,7 +334,7 @@ public function forward()
      *
      * @param string $message A message
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
     public function info($message)
     {
@@ -340,7 +349,7 @@ public function info($message)
      * @param string $uri  Uniform resource identifier
      * @param string $text Text in the response
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
     public function check($uri, $text = null)
     {
@@ -359,7 +368,7 @@ public function check($uri, $text = null)
      * @param string $class   Class name
      * @param string $message Message name
      *
-     * @return sfTestFunctionalBase The current sfTestFunctionalBase instance
+     * @return \sfTestFunctionalBase The current sfTestFunctionalBase instance
      */
     public function throwsException($class = null, $message = null)
     {
@@ -422,25 +431,25 @@ public static function handlePhpError($errno, $errstr, $errfile, $errline)
             case E_WARNING:
                 $msg = sprintf($msg, 'warning');
 
-                throw new RuntimeException($msg);
+                throw new \RuntimeException($msg);
                 break;
 
             case E_NOTICE:
                 $msg = sprintf($msg, 'notice');
 
-                throw new RuntimeException($msg);
+                throw new \RuntimeException($msg);
                 break;
 
             case E_STRICT:
                 $msg = sprintf($msg, 'strict');
 
-                throw new RuntimeException($msg);
+                throw new \RuntimeException($msg);
                 break;
 
             case E_RECOVERABLE_ERROR:
                 $msg = sprintf($msg, 'catchable');
 
-                throw new RuntimeException($msg);
+                throw new \RuntimeException($msg);
                 break;
         }
 
@@ -457,19 +466,19 @@ public function handleException($exception)
         $this->test()->error(sprintf('%s: %s', get_class($exception), $exception->getMessage()));
 
         $traceData = $exception->getTrace();
-        array_unshift($traceData, array(
+        array_unshift($traceData, [
             'function' => '',
             'file' => null != $exception->getFile() ? $exception->getFile() : 'n/a',
             'line' => null != $exception->getLine() ? $exception->getLine() : 'n/a',
-            'args' => array(),
-        ));
+            'args' => [],
+        ]);
 
-        $traces = array();
+        $traces = [];
         $lineFormat = '  at %s%s%s() in %s line %s';
         for ($i = 0, $count = count($traceData); $i < $count; ++$i) {
             $line = isset($traceData[$i]['line']) ? $traceData[$i]['line'] : 'n/a';
             $file = isset($traceData[$i]['file']) ? $traceData[$i]['file'] : 'n/a';
-            $args = isset($traceData[$i]['args']) ? $traceData[$i]['args'] : array();
+            $args = isset($traceData[$i]['args']) ? $traceData[$i]['args'] : [];
             $this->test()->error(sprintf(
                 $lineFormat,
                 isset($traceData[$i]['class']) ? $traceData[$i]['class'] : '',
diff --git a/lib/test/sfTester.class.php b/lib/test/sfTester.class.php
index 1be904270..c52a93998 100644
--- a/lib/test/sfTester.class.php
+++ b/lib/test/sfTester.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,10 +25,10 @@ abstract class sfTester
     /**
      * Constructor.
      *
-     * @param sfTestFunctionalBase $browser A browser
-     * @param lime_test            $tester  A tester object
+     * @param \sfTestFunctionalBase $browser A browser
+     * @param \lime_test            $tester  A tester object
      */
-    public function __construct(sfTestFunctionalBase $browser, $tester)
+    public function __construct(\sfTestFunctionalBase $browser, $tester)
     {
         $this->browser = $browser;
         $this->tester = $tester;
@@ -35,7 +36,7 @@ public function __construct(sfTestFunctionalBase $browser, $tester)
 
     public function __call($method, $arguments)
     {
-        call_user_func_array(array($this->browser, $method), $arguments);
+        call_user_func_array([$this->browser, $method], $arguments);
 
         return $this->getObjectToReturn();
     }
@@ -53,7 +54,7 @@ abstract public function initialize();
     /**
      * Begins a block.
      *
-     * @return sfTester This sfTester instance
+     * @return \sfTester This sfTester instance
      */
     public function begin()
     {
@@ -65,7 +66,7 @@ public function begin()
     /**
      * Ends a block.
      *
-     * @param sfTestFunctionalBase
+     * @param \sfTestFunctionalBase
      */
     public function end()
     {
diff --git a/lib/test/sfTesterForm.class.php b/lib/test/sfTesterForm.class.php
index af02b0b5d..56966ff0f 100644
--- a/lib/test/sfTesterForm.class.php
+++ b/lib/test/sfTesterForm.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,21 +16,21 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterForm extends sfTester
+class sfTesterForm extends \sfTester
 {
     protected $form;
 
     /**
      * Constructor.
      *
-     * @param sfTestFunctionalBase $browser A browser
-     * @param lime_test            $tester  A tester object
+     * @param \sfTestFunctionalBase $browser A browser
+     * @param \lime_test            $tester  A tester object
      */
-    public function __construct(sfTestFunctionalBase $browser, $tester)
+    public function __construct(\sfTestFunctionalBase $browser, $tester)
     {
         parent::__construct($browser, $tester);
 
-        $this->browser->addListener('template.filter_parameters', array($this, 'filterTemplateParameters'));
+        $this->browser->addListener('template.filter_parameters', [$this, 'filterTemplateParameters']);
     }
 
     /**
@@ -49,7 +50,7 @@ public function initialize()
             $action = $this->browser->getContext()->getActionStack()->getLastEntry()->getActionInstance();
 
             foreach ($action->getVarHolder()->getAll() as $name => $value) {
-                if ($value instanceof sfForm && $value->isBound()) {
+                if ($value instanceof \sfForm && $value->isBound()) {
                     $this->form = $value;
 
                     break;
@@ -61,7 +62,7 @@ public function initialize()
     /**
      * Returns the current form.
      *
-     * @return sfForm The current sfForm form instance
+     * @return \sfForm The current sfForm form instance
      */
     public function getForm()
     {
@@ -78,7 +79,7 @@ public function getForm()
     public function hasErrors($value = true)
     {
         if (null === $this->form) {
-            throw new LogicException('no form has been submitted.');
+            throw new \LogicException('no form has been submitted.');
         }
 
         if (is_int($value)) {
@@ -121,11 +122,11 @@ public function hasGlobalError($value = true)
     public function isError($field, $value = true)
     {
         if (null === $this->form) {
-            throw new LogicException('no form has been submitted.');
+            throw new \LogicException('no form has been submitted.');
         }
 
         if (null === $field) {
-            $error = new sfValidatorErrorSchema(new sfValidatorPass());
+            $error = new \sfValidatorErrorSchema(new \sfValidatorPass());
             foreach ($this->form->getGlobalErrors() as $globalError) {
                 $error->addError($globalError);
             }
@@ -166,7 +167,7 @@ public function isError($field, $value = true)
     public function debug()
     {
         if (null === $this->form) {
-            throw new LogicException('no form has been submitted.');
+            throw new \LogicException('no form has been submitted.');
         }
 
         echo $this->tester->error('Form debug');
@@ -180,12 +181,12 @@ public function debug()
     /**
      * Listens to the template.filter_parameters event to get the submitted form object.
      *
-     * @param sfEvent $event      The event
-     * @param array   $parameters An array of parameters passed to the template
+     * @param \sfEvent $event      The event
+     * @param array    $parameters An array of parameters passed to the template
      *
      * @return array The array of parameters passed to the template
      */
-    public function filterTemplateParameters(sfEvent $event, $parameters)
+    public function filterTemplateParameters(\sfEvent $event, $parameters)
     {
         if (!isset($parameters['sf_type'])) {
             return $parameters;
@@ -193,7 +194,7 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
 
         if ('action' == $parameters['sf_type']) {
             foreach ($parameters as $key => $value) {
-                if ($value instanceof sfForm && $value->isBound()) {
+                if ($value instanceof \sfForm && $value->isBound()) {
                     $this->form = $value;
 
                     break;
@@ -207,7 +208,7 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
     /**
      * @param string $path
      *
-     * @return sfFormField
+     * @return \sfFormField
      */
     public function getFormField($path)
     {
diff --git a/lib/test/sfTesterMailer.class.php b/lib/test/sfTesterMailer.class.php
index acdd755ff..24acdf5e2 100644
--- a/lib/test/sfTesterMailer.class.php
+++ b/lib/test/sfTesterMailer.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterMailer extends sfTester
+class sfTesterMailer extends \sfTester
 {
     protected $logger;
     protected $message;
@@ -180,7 +181,7 @@ public function checkHeader($key, $value)
             $this->tester->fail('unable to test as no email were sent');
         }
 
-        $headers = array();
+        $headers = [];
         foreach ($this->message->getHeaders()->getAll($key) as $header) {
             $headers[] = $header->getFieldBody();
         }
diff --git a/lib/test/sfTesterRequest.class.php b/lib/test/sfTesterRequest.class.php
index bd66957f8..7d0781702 100644
--- a/lib/test/sfTesterRequest.class.php
+++ b/lib/test/sfTesterRequest.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterRequest extends sfTester
+class sfTesterRequest extends \sfTester
 {
     protected $request;
 
diff --git a/lib/test/sfTesterResponse.class.php b/lib/test/sfTesterResponse.class.php
index 976a9b610..29b8e72e5 100644
--- a/lib/test/sfTesterResponse.class.php
+++ b/lib/test/sfTesterResponse.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterResponse extends sfTester
+class sfTesterResponse extends \sfTester
 {
     protected $response;
     protected $dom;
@@ -38,7 +39,7 @@ public function initialize()
         $this->dom = null;
         $this->domCssSelector = null;
         if (preg_match('/(x|ht)ml/i', $this->response->getContentType(), $matches)) {
-            $this->dom = new DOMDocument('1.0', $this->response->getCharset());
+            $this->dom = new \DOMDocument('1.0', $this->response->getCharset());
             $this->dom->validateOnParse = true;
             if ('x' == $matches[1]) {
                 @$this->dom->loadXML($this->response->getContent());
@@ -47,7 +48,7 @@ public function initialize()
                     @$this->dom->loadHTML($content);
                 }
             }
-            $this->domCssSelector = new sfDomCssSelector($this->dom);
+            $this->domCssSelector = new \sfDomCssSelector($this->dom);
         }
     }
 
@@ -60,10 +61,10 @@ public function initialize()
      *
      * @return sfTester|sfTestFunctionalBase
      */
-    public function checkElement($selector, $value = true, $options = array())
+    public function checkElement($selector, $value = true, $options = [])
     {
         if (null === $this->dom) {
-            throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
+            throw new \LogicException('The DOM is not accessible because the browser response content type is not HTML.');
         }
 
         if (is_object($selector)) {
@@ -107,21 +108,21 @@ public function checkElement($selector, $value = true, $options = array())
      */
     public function checkForm($form, $selector = 'form')
     {
-        if (!$form instanceof sfForm) {
+        if (!$form instanceof \sfForm) {
             $form = new $form();
         }
 
-        $rendered = array();
+        $rendered = [];
         foreach ($this->domCssSelector->matchAll(sprintf('%1$s input, %1$s textarea, %1$s select', $selector))->getNodes() as $element) {
             $rendered[] = $element->getAttribute('name');
         }
 
         foreach ($form as $field => $widget) {
-            $dom = new DOMDocument('1.0', sfConfig::get('sf_charset'));
+            $dom = new \DOMDocument('1.0', \sfConfig::get('sf_charset'));
             $dom->loadHTML((string) $widget);
 
             foreach ($dom->getElementsByTagName('*') as $element) {
-                if (in_array($element->tagName, array('input', 'select', 'textarea'))) {
+                if (in_array($element->tagName, ['input', 'select', 'textarea'])) {
                     if (false !== $pos = array_search($element->getAttribute('name'), $rendered)) {
                         unset($rendered[$pos]);
                     }
@@ -142,18 +143,18 @@ public function checkForm($form, $selector = 'form')
      *
      * @return sfTester|sfTestFunctionalBase
      *
-     * @throws LogicException If the response is neither XML nor (X)HTML
+     * @throws \LogicException If the response is neither XML nor (X)HTML
      */
     public function isValid($checkDTD = false)
     {
         if (preg_match('/(x|ht)ml/i', $this->response->getContentType())) {
             $revert = libxml_use_internal_errors(true);
 
-            $dom = new DOMDocument('1.0', $this->response->getCharset());
+            $dom = new \DOMDocument('1.0', $this->response->getCharset());
             $content = $this->response->getContent();
 
             if (true === $checkDTD) {
-                $cache = sfConfig::get('sf_cache_dir').'/sf_tester_response/w3';
+                $cache = \sfConfig::get('sf_cache_dir').'/sf_tester_response/w3';
                 if (':' == $cache[1]) {
                     // On Windows systems the path will be like c:\symfony\cache\xml.dtd
                     // I did not manage to get DOMDocument loading a file protocol url including the drive letter
@@ -168,13 +169,13 @@ public function isValid($checkDTD = false)
                 }
 
                 if (!file_exists($cache.'/TR/xhtml11/DTD/xhtml11.dtd')) {
-                    $filesystem = new sfFilesystem();
+                    $filesystem = new \sfFilesystem();
 
-                    $finder = sfFinder::type('any')->discard('.sf');
+                    $finder = \sfFinder::type('any')->discard('.sf');
                     $filesystem->mirror(__DIR__.'/w3', $cache, $finder);
 
-                    $finder = sfFinder::type('file');
-                    $filesystem->replaceTokens($finder->in($cache), '##', '##', array('LOCAL_W3' => $local));
+                    $finder = \sfFinder::type('file');
+                    $filesystem->replaceTokens($finder->in($cache), '##', '##', ['LOCAL_W3' => $local]);
                 }
 
                 $content = preg_replace('#(<!DOCTYPE[^>]+")http://www.w3.org(.*")#i', '\\1'.$local.'\\2', $content);
@@ -218,7 +219,7 @@ public function isValid($checkDTD = false)
 
             libxml_use_internal_errors($revert);
         } else {
-            throw new LogicException(sprintf('Unable to validate responses of content type "%s"', $this->response->getContentType()));
+            throw new \LogicException(sprintf('Unable to validate responses of content type "%s"', $this->response->getContentType()));
         }
 
         return $this->getObjectToReturn();
@@ -291,7 +292,7 @@ public function isHeader($key, $value)
      *
      * @return sfTester|sfTestFunctionalBase
      */
-    public function setsCookie($name, $value = null, $attributes = array())
+    public function setsCookie($name, $value = null, $attributes = [])
     {
         foreach ($this->response->getCookies() as $cookie) {
             if ($name == $cookie['name']) {
@@ -303,7 +304,7 @@ public function setsCookie($name, $value = null, $attributes = array())
 
                 foreach ($attributes as $attributeName => $attributeValue) {
                     if (!array_key_exists($attributeName, $cookie)) {
-                        throw new LogicException(sprintf('The cookie attribute "%s" is not valid.', $attributeName));
+                        throw new \LogicException(sprintf('The cookie attribute "%s" is not valid.', $attributeName));
                     }
 
                     $this->tester->is($cookie[$attributeName], $attributeValue, sprintf('"%s" cookie "%s" attribute is "%s"', $name, $attributeName, $attributeValue));
@@ -328,7 +329,7 @@ public function setsCookie($name, $value = null, $attributes = array())
     public function matches($regex)
     {
         if (!preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $regex, $match)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a valid regular expression.', $regex));
+            throw new \InvalidArgumentException(sprintf('"%s" is not a valid regular expression.', $regex));
         }
 
         if ('!' == $match[1]) {
@@ -382,7 +383,7 @@ public function debug($realOutput = false)
     {
         echo $this->tester->error('Response debug');
 
-        if (!$realOutput && null !== sfException::getLastException()) {
+        if (!$realOutput && null !== \sfException::getLastException()) {
             // print the exception and the stack trace instead of the "normal" output
             $this->tester->comment('WARNING');
             $this->tester->comment('An error occurred when processing this request.');
@@ -396,7 +397,7 @@ public function debug($realOutput = false)
         }
 
         foreach ($this->response->getCookies() as $cookie) {
-            vprintf("Set-Cookie: %s=%s; %spath=%s%s%s%s\n", array(
+            vprintf("Set-Cookie: %s=%s; %spath=%s%s%s%s\n", [
                 $cookie['name'],
                 $cookie['value'],
                 null === $cookie['expire'] ? '' : sprintf('expires=%s; ', date('D d-M-Y H:i:s T', $cookie['expire'])),
@@ -404,11 +405,11 @@ public function debug($realOutput = false)
                 $cookie['domain'] ? sprintf('; domain=%s', $cookie['domain']) : '',
                 $cookie['secure'] ? '; secure' : '',
                 $cookie['httpOnly'] ? '; HttpOnly' : '',
-            ));
+            ]);
         }
 
         echo "\n";
-        if (!$realOutput && null !== $exception = sfException::getLastException()) {
+        if (!$realOutput && null !== $exception = \sfException::getLastException()) {
             echo $exception;
         } else {
             echo $this->response->getContent();
diff --git a/lib/test/sfTesterUser.class.php b/lib/test/sfTesterUser.class.php
index 59cd8cb62..e16b7825f 100644
--- a/lib/test/sfTesterUser.class.php
+++ b/lib/test/sfTesterUser.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterUser extends sfTester
+class sfTesterUser extends \sfTester
 {
     protected $user;
 
diff --git a/lib/test/sfTesterViewCache.class.php b/lib/test/sfTesterViewCache.class.php
index c4ae4991d..1019e9fa1 100644
--- a/lib/test/sfTesterViewCache.class.php
+++ b/lib/test/sfTesterViewCache.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfTesterViewCache extends sfTester
+class sfTesterViewCache extends \sfTester
 {
     protected $viewCacheManager;
     protected $response;
@@ -103,7 +104,7 @@ public function isUriCached($uri, $boolean, $with_layout = false)
                 } else {
                     $ret = unserialize($cacheManager->get($uri));
                     $content = $ret['content'];
-                    $this->tester->ok(false !== strpos($this->response->getContent(), $content), 'content in cache is ok');
+                    $this->tester->ok(str_contains($this->response->getContent(), $content), 'content in cache is ok');
                 }
             }
         }
diff --git a/lib/user/sfBasicSecurityUser.class.php b/lib/user/sfBasicSecurityUser.class.php
index 4a82bfa0a..b21445925 100644
--- a/lib/user/sfBasicSecurityUser.class.php
+++ b/lib/user/sfBasicSecurityUser.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfBasicSecurityUser extends sfUser implements sfSecurityUser
+class sfBasicSecurityUser extends \sfUser implements \sfSecurityUser
 {
     public const LAST_REQUEST_NAMESPACE = 'symfony/user/sfUser/lastRequest';
     public const AUTH_NAMESPACE = 'symfony/user/sfUser/authenticated';
@@ -35,7 +35,7 @@ class sfBasicSecurityUser extends sfUser implements sfSecurityUser
      */
     public function clearCredentials()
     {
-        $this->credentials = array();
+        $this->credentials = [];
     }
 
     /**
@@ -59,7 +59,7 @@ public function removeCredential($credential)
             foreach ($this->credentials as $key => $value) {
                 if ($credential == $value) {
                     if ($this->options['logging']) {
-                        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Remove credential "%s"', $credential))));
+                        $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Remove credential "%s"', $credential)]));
                     }
 
                     unset($this->credentials[$key]);
@@ -95,7 +95,7 @@ public function addCredentials()
         $credentials = (is_array(func_get_arg(0))) ? func_get_arg(0) : func_get_args();
 
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Add credential(s) "%s"', implode(', ', $credentials)))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Add credential(s) "%s"', implode(', ', $credentials))]));
         }
 
         $added = false;
@@ -171,7 +171,7 @@ public function isAuthenticated()
     public function setAuthenticated($authenticated)
     {
         if ($this->options['logging']) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('User is %sauthenticated', true === $authenticated ? '' : 'not '))));
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('User is %sauthenticated', true === $authenticated ? '' : 'not ')]));
         }
 
         if ((bool) $authenticated !== $this->authenticated) {
@@ -182,7 +182,7 @@ public function setAuthenticated($authenticated)
                 $this->clearCredentials();
             }
 
-            $this->dispatcher->notify(new sfEvent($this, 'user.change_authentication', array('authenticated' => $this->authenticated)));
+            $this->dispatcher->notify(new \sfEvent($this, 'user.change_authentication', ['authenticated' => $this->authenticated]));
 
             $this->storage->regenerate(true);
         }
@@ -214,13 +214,13 @@ public function getLastRequestTime()
      *  * timeout: Timeout to automatically log out the user in seconds (1800 by default)
      *             Set to false to disable
      *
-     * @param sfEventDispatcher $dispatcher an sfEventDispatcher instance
-     * @param sfStorage         $storage    an sfStorage instance
-     * @param array             $options    an associative array of options
+     * @param \sfEventDispatcher $dispatcher an sfEventDispatcher instance
+     * @param \sfStorage         $storage    an sfStorage instance
+     * @param array              $options    an associative array of options
      *
-     * @see sfUser
+     * @see \sfUser
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, \sfStorage $storage, $options = [])
     {
         // initialize parent
         parent::initialize($dispatcher, $storage, $options);
@@ -236,13 +236,13 @@ public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $o
 
         if (null === $this->authenticated) {
             $this->authenticated = false;
-            $this->credentials = array();
+            $this->credentials = [];
         } else {
             // Automatic logout logged in user if no request within timeout parameter seconds
             $timeout = $this->options['timeout'];
             if (false !== $timeout && null !== $this->lastRequest && time() - $this->lastRequest >= $timeout) {
                 if ($this->options['logging']) {
-                    $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Automatic user logout due to timeout')));
+                    $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Automatic user logout due to timeout']));
                 }
 
                 $this->setTimedOut();
diff --git a/lib/user/sfSecurityUser.class.php b/lib/user/sfSecurityUser.class.php
index b3a3d63bf..81c50dca5 100644
--- a/lib/user/sfSecurityUser.class.php
+++ b/lib/user/sfSecurityUser.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/lib/user/sfUser.class.php b/lib/user/sfUser.class.php
index 45e6881dd..c9e13fce3 100644
--- a/lib/user/sfUser.class.php
+++ b/lib/user/sfUser.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +20,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfUser implements ArrayAccess
+class sfUser implements \ArrayAccess
 {
     /**
      * The namespace under which attributes will be stored.
@@ -29,16 +29,16 @@ class sfUser implements ArrayAccess
 
     public const CULTURE_NAMESPACE = 'symfony/user/sfUser/culture';
 
-    protected $options = array();
+    protected $options = [];
 
-    /** @var sfNamespacedParameterHolder */
+    /** @var \sfNamespacedParameterHolder */
     protected $attributeHolder;
     protected $culture;
 
-    /** @var sfStorage */
+    /** @var \sfStorage */
     protected $storage;
 
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
     /**
@@ -48,12 +48,12 @@ class sfUser implements ArrayAccess
      *
      * @param array $options
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, \sfStorage $storage, $options = [])
     {
         $this->initialize($dispatcher, $storage, $options);
 
         if ($this->options['auto_shutdown']) {
-            register_shutdown_function(array($this, 'shutdown'));
+            register_shutdown_function([$this, 'shutdown']);
         }
     }
 
@@ -65,13 +65,13 @@ public function __construct(sfEventDispatcher $dispatcher, sfStorage $storage, $
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException If the calls fails
+     * @throws \sfException If the calls fails
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'user.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'user.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -88,24 +88,24 @@ public function __call($method, $arguments)
      *  * use_flash:       Whether to enable flash usage (false by default)
      *  * logging:         Whether to enable logging (false by default)
      *
-     * @param sfEventDispatcher $dispatcher an sfEventDispatcher instance
-     * @param sfStorage         $storage    an sfStorage instance
-     * @param array             $options    an associative array of options
+     * @param \sfEventDispatcher $dispatcher an sfEventDispatcher instance
+     * @param \sfStorage         $storage    an sfStorage instance
+     * @param array              $options    an associative array of options
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, \sfStorage $storage, $options = [])
     {
         $this->dispatcher = $dispatcher;
         $this->storage = $storage;
 
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'auto_shutdown' => true,
             'culture' => null,
             'default_culture' => 'en',
             'use_flash' => false,
             'logging' => false,
-        ), $options);
+        ], $options);
 
-        $this->attributeHolder = new sfNamespacedParameterHolder(self::ATTRIBUTE_NAMESPACE);
+        $this->attributeHolder = new \sfNamespacedParameterHolder(self::ATTRIBUTE_NAMESPACE);
 
         // read attributes from storage
         $attributes = $storage->read(self::ATTRIBUTE_NAMESPACE);
@@ -125,7 +125,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfStorage $storage, $o
         // flag current flash to be removed at shutdown
         if ($this->options['use_flash'] && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash')) {
             if ($this->options['logging']) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Flag old flash messages ("%s")', implode('", "', $names)))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Flag old flash messages ("%s")', implode('", "', $names))]));
             }
 
             foreach ($names as $name) {
@@ -154,7 +154,7 @@ public function setCulture($culture)
         if ($this->culture != $culture) {
             $this->culture = $culture;
 
-            $this->dispatcher->notify(new sfEvent($this, 'user.change_culture', array('culture' => $culture)));
+            $this->dispatcher->notify(new \sfEvent($this, 'user.change_culture', ['culture' => $culture]));
         }
     }
 
@@ -301,7 +301,7 @@ public function shutdown()
         // remove flash that are tagged to be removed
         if ($this->options['use_flash'] && $names = $this->attributeHolder->getNames('symfony/user/sfUser/flash/remove')) {
             if ($this->options['logging']) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Remove old flash messages ("%s")', implode('", "', $names)))));
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Remove old flash messages ("%s")', implode('", "', $names))]));
             }
 
             foreach ($names as $name) {
@@ -310,7 +310,7 @@ public function shutdown()
             }
         }
 
-        $attributes = array();
+        $attributes = [];
         foreach ($this->attributeHolder->getNamespaces() as $namespace) {
             $attributes[$namespace] = $this->attributeHolder->getAll($namespace);
         }
diff --git a/lib/util/sfBrowser.class.php b/lib/util/sfBrowser.class.php
index 47ef10627..47cf93eec 100644
--- a/lib/util/sfBrowser.class.php
+++ b/lib/util/sfBrowser.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,45 +16,45 @@
  *
  * @version    SVN: $Id$
  */
-class sfBrowser extends sfBrowserBase
+class sfBrowser extends \sfBrowserBase
 {
-    protected $listeners = array();
+    protected $listeners = [];
     protected $context;
     protected $currentException;
-    protected $rawConfiguration = array();
+    protected $rawConfiguration = [];
 
     /**
      * Returns the current application context.
      *
      * @param bool $forceReload true to force context reload, false otherwise
      *
-     * @return sfContext
+     * @return \sfContext
      */
     public function getContext($forceReload = false)
     {
         if (null === $this->context || $forceReload) {
             $isContextEmpty = null === $this->context;
-            $context = $isContextEmpty ? sfContext::getInstance() : $this->context;
+            $context = $isContextEmpty ? \sfContext::getInstance() : $this->context;
 
             // create configuration
             $currentConfiguration = $context->getConfiguration();
-            $configuration = ProjectConfiguration::getApplicationConfiguration($currentConfiguration->getApplication(), $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug());
+            $configuration = \ProjectConfiguration::getApplicationConfiguration($currentConfiguration->getApplication(), $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug());
 
             // connect listeners
-            $configuration->getEventDispatcher()->connect('application.throw_exception', array($this, 'listenToException'));
+            $configuration->getEventDispatcher()->connect('application.throw_exception', [$this, 'listenToException']);
             foreach ($this->listeners as $name => $listener) {
                 $configuration->getEventDispatcher()->connect($name, $listener);
             }
 
             // create context
-            $this->context = sfContext::createInstance($configuration);
+            $this->context = \sfContext::createInstance($configuration);
             unset($currentConfiguration);
 
             if (!$isContextEmpty) {
-                sfConfig::clear();
-                sfConfig::add($this->rawConfiguration);
+                \sfConfig::clear();
+                \sfConfig::add($this->rawConfiguration);
             } else {
-                $this->rawConfiguration = sfConfig::getAll();
+                $this->rawConfiguration = \sfConfig::getAll();
             }
         }
 
@@ -68,7 +69,7 @@ public function addListener($name, $listener)
     /**
      * Gets response.
      *
-     * @return sfWebResponse
+     * @return \sfWebResponse
      */
     public function getResponse()
     {
@@ -78,7 +79,7 @@ public function getResponse()
     /**
      * Gets request.
      *
-     * @return sfWebRequest
+     * @return \sfWebRequest
      */
     public function getRequest()
     {
@@ -88,7 +89,7 @@ public function getRequest()
     /**
      * Gets user.
      *
-     * @return sfUser
+     * @return \sfUser
      */
     public function getUser()
     {
@@ -103,15 +104,15 @@ public function shutdown()
         parent::shutdown();
 
         // we remove all session data
-        sfToolkit::clearDirectory(sfConfig::get('sf_test_cache_dir').'/sessions');
+        \sfToolkit::clearDirectory(\sfConfig::get('sf_test_cache_dir').'/sessions');
     }
 
     /**
      * Listener for exceptions.
      *
-     * @param sfEvent $event The event to handle
+     * @param \sfEvent $event The event to handle
      */
-    public function listenToException(sfEvent $event)
+    public function listenToException(\sfEvent $event)
     {
         $this->setCurrentException($event->getSubject());
     }
@@ -122,13 +123,13 @@ public function listenToException(sfEvent $event)
     protected function doCall()
     {
         // Before getContext, it can trigger some
-        sfConfig::set('sf_test', true);
+        \sfConfig::set('sf_test', true);
 
         // recycle our context object
         $this->context = $this->getContext(true);
 
         // we register a fake rendering filter
-        sfConfig::set('sf_rendering_filter', array('sfFakeRenderingFilter', null));
+        \sfConfig::set('sf_rendering_filter', ['sfFakeRenderingFilter', null]);
 
         $this->resetCurrentException();
 
@@ -148,7 +149,7 @@ protected function doCall()
     }
 }
 
-class sfFakeRenderingFilter extends sfFilter
+class sfFakeRenderingFilter extends \sfFilter
 {
     public function execute($filterChain)
     {
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
index 4c9929a2f..8b181b732 100755
--- a/lib/util/sfBrowserBase.class.php
+++ b/lib/util/sfBrowserBase.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,14 +23,14 @@ abstract class sfBrowserBase
     protected $hostname;
     protected $remote;
     protected $dom;
-    protected $stack = array();
+    protected $stack = [];
     protected $stackPosition = -1;
-    protected $cookieJar = array();
-    protected $fields = array();
-    protected $files = array();
-    protected $vars = array();
-    protected $defaultServerArray = array();
-    protected $headers = array();
+    protected $cookieJar = [];
+    protected $fields = [];
+    protected $files = [];
+    protected $vars = [];
+    protected $defaultServerArray = [];
+    protected $headers = [];
     protected $currentException;
     protected $domCssSelector;
 
@@ -40,7 +41,7 @@ abstract class sfBrowserBase
      * @param string $remote   Remote address to spook
      * @param array  $options  Options for sfBrowser
      */
-    public function __construct($hostname = null, $remote = null, $options = array())
+    public function __construct($hostname = null, $remote = null, $options = [])
     {
         $this->initialize($hostname, $remote, $options);
     }
@@ -52,7 +53,7 @@ public function __construct($hostname = null, $remote = null, $options = array()
      * @param string $remote   Remote address to spook
      * @param array  $options  Options for sfBrowser
      */
-    public function initialize($hostname = null, $remote = null, $options = array())
+    public function initialize($hostname = null, $remote = null, $options = [])
     {
         unset($_SERVER['argv'], $_SERVER['argc']);
 
@@ -67,7 +68,7 @@ public function initialize($hostname = null, $remote = null, $options = array())
         $this->defaultServerArray = $_SERVER;
 
         // register our shutdown function
-        register_shutdown_function(array($this, 'shutdown'));
+        register_shutdown_function([$this, 'shutdown']);
     }
 
     /**
@@ -76,7 +77,7 @@ public function initialize($hostname = null, $remote = null, $options = array())
      * @param string $name  The variable name
      * @param mixed  $value The value
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function setVar($name, $value)
     {
@@ -109,11 +110,11 @@ public function setHttpHeader($header, $value)
      * @param bool   $secure   If secure
      * @param bool   $httpOnly If uses only HTTP
      *
-     * @return sfBrowserBase This sfBrowserBase instance
+     * @return \sfBrowserBase This sfBrowserBase instance
      */
     public function setCookie($name, $value, $expire = null, $path = '/', $domain = '', $secure = false, $httpOnly = false)
     {
-        $this->cookieJar[$name] = array(
+        $this->cookieJar[$name] = [
             'name' => $name,
             'value' => $value,
             'expire' => $expire,
@@ -121,7 +122,7 @@ public function setCookie($name, $value, $expire = null, $path = '/', $domain =
             'domain' => $domain,
             'secure' => (bool) $secure,
             'httpOnly' => $httpOnly,
-        );
+        ];
 
         return $this;
     }
@@ -131,7 +132,7 @@ public function setCookie($name, $value, $expire = null, $path = '/', $domain =
      *
      * @param string $name The cookie name
      *
-     * @return sfBrowserBase This sfBrowserBase instance
+     * @return \sfBrowserBase This sfBrowserBase instance
      */
     public function removeCookie($name)
     {
@@ -143,11 +144,11 @@ public function removeCookie($name)
     /**
      * Clears all cookies.
      *
-     * @return sfBrowserBase This sfBrowserBase instance
+     * @return \sfBrowserBase This sfBrowserBase instance
      */
     public function clearCookies()
     {
-        $this->cookieJar = array();
+        $this->cookieJar = [];
 
         return $this;
     }
@@ -158,7 +159,7 @@ public function clearCookies()
      * @param string $username The username
      * @param string $password The password
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function setAuth($username, $password)
     {
@@ -175,9 +176,9 @@ public function setAuth($username, $password)
      * @param array  $parameters  The Request parameters
      * @param bool   $changeStack Change the browser history stack?
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
-    public function get($uri, $parameters = array(), $changeStack = true)
+    public function get($uri, $parameters = [], $changeStack = true)
     {
         return $this->call($uri, 'get', $parameters, $changeStack);
     }
@@ -189,9 +190,9 @@ public function get($uri, $parameters = array(), $changeStack = true)
      * @param array  $parameters  The Request parameters
      * @param bool   $changeStack Change the browser history stack?
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
-    public function post($uri, $parameters = array(), $changeStack = true)
+    public function post($uri, $parameters = [], $changeStack = true)
     {
         return $this->call($uri, 'post', $parameters, $changeStack);
     }
@@ -204,9 +205,9 @@ public function post($uri, $parameters = array(), $changeStack = true)
      * @param array  $parameters  The Request parameters
      * @param bool   $changeStack Change the browser history stack?
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
-    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    public function call($uri, $method = 'get', $parameters = [], $changeStack = true)
     {
         // check that the previous call() hasn't returned an uncatched exception
         $this->checkCurrentExceptionIsEmpty();
@@ -216,22 +217,22 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
         // add uri to the stack
         if ($changeStack) {
             $this->stack = array_slice($this->stack, 0, $this->stackPosition + 1);
-            $this->stack[] = array(
+            $this->stack[] = [
                 'uri' => $uri,
                 'method' => $method,
                 'parameters' => $parameters,
-            );
+            ];
             $this->stackPosition = count($this->stack) - 1;
         }
 
-        list($path, $queryString) = false !== ($pos = strpos($uri, '?')) ? array(substr($uri, 0, $pos), substr($uri, $pos + 1)) : array($uri, '');
+        list($path, $queryString) = false !== ($pos = strpos($uri, '?')) ? [substr($uri, 0, $pos), substr($uri, $pos + 1)] : [$uri, ''];
         $queryString = html_entity_decode($queryString);
 
         // remove anchor
         $path = preg_replace('/#.*/', '', $path);
 
         // removes all fields from previous request
-        $this->fields = array();
+        $this->fields = [];
 
         // prepare the request object
         $_SERVER = $this->defaultServerArray;
@@ -258,14 +259,14 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
         foreach ($this->headers as $header => $value) {
             $_SERVER['HTTP_'.strtoupper(str_replace('-', '_', $header))] = $value;
         }
-        $this->headers = array();
+        $this->headers = [];
 
         // request parameters
-        $_GET = $_POST = array();
-        if (in_array(strtoupper($method), array('POST', 'DELETE', 'PUT', 'PATCH'))) {
+        $_GET = $_POST = [];
+        if (in_array(strtoupper($method), ['POST', 'DELETE', 'PUT', 'PATCH'])) {
             if (isset($parameters['_with_csrf']) && $parameters['_with_csrf']) {
                 unset($parameters['_with_csrf']);
-                $form = new BaseForm();
+                $form = new \BaseForm();
                 $parameters[$form->getCSRFFieldName()] = $form->getCSRFToken();
             }
 
@@ -276,11 +277,11 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
         }
 
         // handle input type="file" fields
-        $_FILES = array();
+        $_FILES = [];
         if (count($this->files)) {
             $_FILES = $this->files;
         }
-        $this->files = array();
+        $this->files = [];
 
         parse_str($queryString, $qs);
         if (is_array($qs)) {
@@ -296,7 +297,7 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
         }
 
         // restore cookies
-        $_COOKIE = array();
+        $_COOKIE = [];
         foreach ($this->cookieJar as $name => $cookie) {
             $_COOKIE[$name] = $cookie['value'];
         }
@@ -329,7 +330,7 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
         $this->dom = null;
         $this->domCssSelector = null;
         if (preg_match('/(x|ht)ml/i', $response->getContentType(), $matches)) {
-            $this->dom = new DOMDocument('1.0', $response->getCharset());
+            $this->dom = new \DOMDocument('1.0', $response->getCharset());
             $this->dom->validateOnParse = true;
             if ('x' == $matches[1]) {
                 @$this->dom->loadXML($response->getContent());
@@ -338,7 +339,7 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
                     @$this->dom->loadHTML($content);
                 }
             }
-            $this->domCssSelector = new sfDomCssSelector($this->dom);
+            $this->domCssSelector = new \sfDomCssSelector($this->dom);
         }
 
         return $this;
@@ -347,12 +348,12 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
     /**
      * Go back in the browser history stack.
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function back()
     {
         if ($this->stackPosition < 1) {
-            throw new LogicException('You are already on the first page.');
+            throw new \LogicException('You are already on the first page.');
         }
 
         --$this->stackPosition;
@@ -363,12 +364,12 @@ public function back()
     /**
      * Go forward in the browser history stack.
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function forward()
     {
         if ($this->stackPosition > count($this->stack) - 2) {
-            throw new LogicException('You are already on the last page.');
+            throw new \LogicException('You are already on the last page.');
         }
 
         ++$this->stackPosition;
@@ -379,12 +380,12 @@ public function forward()
     /**
      * Reload the current browser.
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function reload()
     {
         if (-1 == $this->stackPosition) {
-            throw new LogicException('No page to reload.');
+            throw new \LogicException('No page to reload.');
         }
 
         return $this->call($this->stack[$this->stackPosition]['uri'], $this->stack[$this->stackPosition]['method'], $this->stack[$this->stackPosition]['parameters'], false);
@@ -393,12 +394,12 @@ public function reload()
     /**
      * Get response DOM CSS selector.
      *
-     * @return sfDomCssSelector
+     * @return \sfDomCssSelector
      */
     public function getResponseDomCssSelector()
     {
         if (null === $this->domCssSelector) {
-            throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
+            throw new \LogicException('The DOM is not accessible because the browser response content type is not HTML.');
         }
 
         return $this->domCssSelector;
@@ -407,24 +408,24 @@ public function getResponseDomCssSelector()
     /**
      * Get the response DOM XPath selector.
      *
-     * @return DOMXPath
+     * @return \DOMXPath
      *
      * @uses getResponseDom()
      */
     public function getResponseDomXpath()
     {
-        return new DOMXPath($this->getResponseDom());
+        return new \DOMXPath($this->getResponseDom());
     }
 
     /**
      * Get response DOM.
      *
-     * @return sfDomCssSelector
+     * @return \sfDomCssSelector
      */
     public function getResponseDom()
     {
         if (null === $this->dom) {
-            throw new LogicException('The DOM is not accessible because the browser response content type is not HTML.');
+            throw new \LogicException('The DOM is not accessible because the browser response content type is not HTML.');
         }
 
         return $this->dom;
@@ -433,28 +434,28 @@ public function getResponseDom()
     /**
      * Gets response.
      *
-     * @return sfWebResponse
+     * @return \sfWebResponse
      */
     abstract public function getResponse();
 
     /**
      * Gets request.
      *
-     * @return sfWebRequest
+     * @return \sfWebRequest
      */
     abstract public function getRequest();
 
     /**
      * Gets user.
      *
-     * @return sfUser
+     * @return \sfUser
      */
     abstract public function getUser();
 
     /**
      * Gets the current exception.
      *
-     * @return Exception
+     * @return \Exception
      */
     public function getCurrentException()
     {
@@ -464,9 +465,9 @@ public function getCurrentException()
     /**
      * Sets the current exception.
      *
-     * @param Exception $exception An Exception instance
+     * @param \Exception $exception An Exception instance
      */
-    public function setCurrentException(Exception $exception)
+    public function setCurrentException(\Exception $exception)
     {
         $this->currentException = $exception;
     }
@@ -477,7 +478,7 @@ public function setCurrentException(Exception $exception)
     public function resetCurrentException()
     {
         $this->currentException = null;
-        sfException::clearLastException();
+        \sfException::clearLastException();
     }
 
     /**
@@ -487,20 +488,20 @@ public function resetCurrentException()
      */
     public function checkCurrentExceptionIsEmpty()
     {
-        return null === $this->getCurrentException() || $this->getCurrentException() instanceof sfError404Exception;
+        return null === $this->getCurrentException() || $this->getCurrentException() instanceof \sfError404Exception;
     }
 
     /**
      * Follow redirects?
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      *
-     * @throws sfException If request was not a redirect
+     * @throws \sfException If request was not a redirect
      */
     public function followRedirect()
     {
         if (null === $this->getResponse()->getHttpHeader('Location')) {
-            throw new LogicException('The request was not redirected.');
+            throw new \LogicException('The request was not redirected.');
         }
 
         return $this->get($this->getResponse()->getHttpHeader('Location'));
@@ -512,7 +513,7 @@ public function followRedirect()
      * @param string $name  The field name
      * @param string $value The field value
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function setField($name, $value)
     {
@@ -527,7 +528,7 @@ public function setField($name, $value)
      *
      * @param string $name The checkbox or radiobutton id, name or text
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      *
      * @see    doSelect()
      */
@@ -543,7 +544,7 @@ public function deselect($name)
      *
      * @param string $name The checkbox or radiobutton id, name or text
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      *
      * @see    doSelect()
      */
@@ -577,12 +578,12 @@ public function doSelect($name, $selected)
                 $element->setAttribute('checked', 'checked');
             } else {
                 if ('radio' == $element->getAttribute('type')) {
-                    throw new InvalidArgumentException('Radiobutton cannot be deselected - Select another radiobutton to deselect the current.');
+                    throw new \InvalidArgumentException('Radiobutton cannot be deselected - Select another radiobutton to deselect the current.');
                 }
                 $element->removeAttribute('checked');
             }
         } else {
-            throw new InvalidArgumentException(sprintf('Cannot find the "%s" checkbox or radiobutton.', $name));
+            throw new \InvalidArgumentException(sprintf('Cannot find the "%s" checkbox or radiobutton.', $name));
         }
     }
 
@@ -600,18 +601,18 @@ public function doSelect($name, $selected)
      * @param array             $arguments The arguments to pass to the link
      * @param array             $options   An array of options
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      *
      * @uses   doClickElement() doClick() doClickCssSelector()
      */
-    public function click($name, $arguments = array(), $options = array())
+    public function click($name, $arguments = [], $options = [])
     {
-        if ($name instanceof DOMElement) {
+        if ($name instanceof \DOMElement) {
             list($uri, $method, $parameters) = $this->doClickElement($name, $arguments, $options);
         } else {
             try {
                 list($uri, $method, $parameters) = $this->doClick($name, $arguments, $options);
-            } catch (InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 list($uri, $method, $parameters) = $this->doClickCssSelector($name, $arguments, $options);
             }
         }
@@ -632,14 +633,14 @@ public function click($name, $arguments = array(), $options = array())
      *
      * @uses   getResponseDomXpath() doClickElement()
      *
-     * @throws InvalidArgumentException If a matching element cannot be found
+     * @throws \InvalidArgumentException If a matching element cannot be found
      *
      * @deprecated call {@link click()} using a CSS selector instead
      */
-    public function doClick($name, $arguments = array(), $options = array())
+    public function doClick($name, $arguments = [], $options = [])
     {
-        if (false !== strpos($name, '[') || false !== strpos($name, ']')) {
-            throw new InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
+        if (str_contains($name, '[') ||   str_contains($name, ']')) {
+            throw new \InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
         }
 
         $query = sprintf('//a[.="%s"]', $name);
@@ -648,13 +649,13 @@ public function doClick($name, $arguments = array(), $options = array())
         $query .= sprintf('|//button[.="%s" or @id="%s" or @name="%s"]', $name, $name, $name);
 
         if (!$list = @$this->getResponseDomXpath()->query($query)) {
-            throw new InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
+            throw new \InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
         }
 
         $position = isset($options['position']) ? $options['position'] - 1 : 0;
 
         if (!$item = $list->item($position)) {
-            throw new InvalidArgumentException(sprintf('Cannot find the "%s" link or button (position %d).', $name, $position + 1));
+            throw new \InvalidArgumentException(sprintf('Cannot find the "%s" link or button (position %d).', $name, $position + 1));
         }
 
         return $this->doClickElement($item, $arguments, $options);
@@ -673,9 +674,9 @@ public function doClick($name, $arguments = array(), $options = array())
      *
      * @uses   getResponseDomCssSelector() doClickElement()
      *
-     * @throws InvalidArgumentException If a matching element cannot be found
+     * @throws \InvalidArgumentException If a matching element cannot be found
      */
-    public function doClickCssSelector($selector, $arguments = array(), $options = array())
+    public function doClickCssSelector($selector, $arguments = [], $options = [])
     {
         $elements = $this->getResponseDomCssSelector()->matchAll($selector)->getNodes();
         $position = isset($options['position']) ? $options['position'] - 1 : 0;
@@ -684,7 +685,7 @@ public function doClickCssSelector($selector, $arguments = array(), $options = a
             return $this->doClickElement($elements[$position], $arguments, $options);
         }
 
-        throw new InvalidArgumentException(sprintf('Could not find the element "%s" (position %d) in the current DOM.', $selector, $position + 1));
+        throw new \InvalidArgumentException(sprintf('Could not find the element "%s" (position %d) in the current DOM.', $selector, $position + 1));
     }
 
     /**
@@ -692,30 +693,30 @@ public function doClickCssSelector($selector, $arguments = array(), $options = a
      *
      * This method is called internally by the {@link click()} method.
      *
-     * @param DOMElement $item      The element being clicked
-     * @param array      $arguments The arguments to pass to the link
-     * @param array      $options   An array of options
+     * @param \DOMElement $item      The element being clicked
+     * @param array       $arguments The arguments to pass to the link
+     * @param array       $options   An array of options
      *
      * @return array An array composed of the URI, the method and the arguments to pass to the call() call
      *
      * @uses getResponseDomXpath()
      */
-    public function doClickElement(DOMElement $item, $arguments = array(), $options = array())
+    public function doClickElement(\DOMElement $item, $arguments = [], $options = [])
     {
         $method = strtolower(isset($options['method']) ? $options['method'] : 'get');
 
         if ('a' == $item->nodeName) {
-            if (in_array($method, array('post', 'put', 'delete'))) {
+            if (in_array($method, ['post', 'put', 'delete'])) {
                 if (isset($options['_with_csrf']) && $options['_with_csrf']) {
                     $arguments['_with_csrf'] = true;
                 }
 
-                return array($item->getAttribute('href'), $method, $arguments);
+                return [$item->getAttribute('href'), $method, $arguments];
             }
 
-            return array($item->getAttribute('href'), 'get', $arguments);
+            return [$item->getAttribute('href'), 'get', $arguments];
         }
-        if ('button' == $item->nodeName || ('input' == $item->nodeName && in_array($item->getAttribute('type'), array('submit', 'button', 'image')))) {
+        if ('button' == $item->nodeName || ('input' == $item->nodeName && in_array($item->getAttribute('type'), ['submit', 'button', 'image']))) {
             // add the item's value to the arguments if name is provided
             if ($item->getAttribute('name')) {
                 $this->parseArgumentAsArray($item->getAttribute('name'), $item->getAttribute('value'), $arguments);
@@ -724,7 +725,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
             // use the ancestor form element
             do {
                 if (null === $item = $item->parentNode) {
-                    throw new Exception('The clicked form element does not have a form ancestor.');
+                    throw new \Exception('The clicked form element does not have a form ancestor.');
                 }
             } while ('form' != $item->nodeName);
         }
@@ -737,8 +738,8 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
         $method = strtolower(isset($options['method']) ? $options['method'] : ($item->getAttribute('method') ?: 'get'));
 
         // merge form default values and arguments
-        $defaults = array();
-        $arguments = sfToolkit::arrayDeepMerge($this->fields, $arguments);
+        $defaults = [];
+        $arguments = \sfToolkit::arrayDeepMerge($this->fields, $arguments);
 
         $xpath = $this->getResponseDomXpath();
         foreach ($xpath->query('descendant::input | descendant::textarea | descendant::select', $item) as $element) {
@@ -755,7 +756,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
                     $value = $element->hasAttribute('value') ? $element->getAttribute('value') : '1';
                 }
             } elseif ('input' == $nodeName && 'file' == $element->getAttribute('type')) {
-                $filename = array_key_exists($elementName, $arguments) ? $arguments[$elementName] : sfToolkit::getArrayValueForPath($arguments, $elementName, '');
+                $filename = array_key_exists($elementName, $arguments) ? $arguments[$elementName] : \sfToolkit::getArrayValueForPath($arguments, $elementName, '');
 
                 if (is_readable($filename)) {
                     $fileError = UPLOAD_ERR_OK;
@@ -767,8 +768,8 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
 
                 unset($arguments[$elementName]);
 
-                $this->parseArgumentAsArray($elementName, array('name' => basename($filename), 'type' => '', 'tmp_name' => $filename, 'error' => $fileError, 'size' => $fileSize), $this->files);
-            } elseif ('input' == $nodeName && !in_array($element->getAttribute('type'), array('submit', 'button', 'image'))) {
+                $this->parseArgumentAsArray($elementName, ['name' => basename($filename), 'type' => '', 'tmp_name' => $filename, 'error' => $fileError, 'size' => $fileSize], $this->files);
+            } elseif ('input' == $nodeName && !in_array($element->getAttribute('type'), ['submit', 'button', 'image'])) {
                 $value = $element->getAttribute('value');
             } elseif ('textarea' == $nodeName) {
                 $value = '';
@@ -778,7 +779,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
             } elseif ('select' == $nodeName) {
                 if ($multiple = $element->hasAttribute('multiple')) {
                     $elementName = str_replace('[]', '', $elementName);
-                    $value = array();
+                    $value = [];
                 } else {
                     $value = null;
                 }
@@ -797,7 +798,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
 
                 // if no option is selected and if it is a simple select box, take the first option as the value
                 $option = $xpath->query('descendant::option', $element)->item(0);
-                if (!$found && !$multiple && $option instanceof DOMElement) {
+                if (!$found && !$multiple && $option instanceof \DOMElement) {
                     $value = $option->getAttribute('value');
                 }
             }
@@ -808,29 +809,29 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
         }
 
         // create request parameters
-        $arguments = sfToolkit::arrayDeepMerge($defaults, $arguments);
-        if (in_array($method, array('post', 'put', 'delete'))) {
-            return array($url, $method, $arguments);
+        $arguments = \sfToolkit::arrayDeepMerge($defaults, $arguments);
+        if (in_array($method, ['post', 'put', 'delete'])) {
+            return [$url, $method, $arguments];
         }
 
         $queryString = is_array($arguments) ? http_build_query($arguments, '', '&') : '';
-        $sep = false === strpos($url, '?') ? '?' : '&';
+        $sep =   !str_contains($url, '?') ? '?' : '&';
 
-        return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
+        return [$url.($queryString ? $sep.$queryString : ''), 'get', []];
     }
 
     /**
      * Reset browser to original state.
      *
-     * @return sfBrowserBase
+     * @return \sfBrowserBase
      */
     public function restart()
     {
         $this->newSession();
-        $this->cookieJar = array();
-        $this->stack = array();
-        $this->fields = array();
-        $this->vars = array();
+        $this->cookieJar = [];
+        $this->stack = [];
+        $this->fields = [];
+        $this->vars = [];
         $this->dom = null;
         $this->stackPosition = -1;
 
@@ -855,9 +856,9 @@ public function shutdown()
     public function fixUri($uri)
     {
         // remove absolute information if needed (to be able to do follow redirects, click on links, ...)
-        if (0 === strpos($uri, 'http')) {
+        if (str_starts_with($uri, 'http')) {
             // detect secure request
-            if (0 === strpos($uri, 'https')) {
+            if (str_starts_with($uri, 'https')) {
                 $this->defaultServerArray['HTTPS'] = 'on';
             } else {
                 unset($this->defaultServerArray['HTTPS']);
@@ -897,7 +898,7 @@ protected function parseArgumentAsArray($name, $value, &$vars)
             }
             if ($var && '[]' === substr($name, -2)) {
                 if (!is_array($var)) {
-                    $var = array($var);
+                    $var = [$var];
                 }
                 $var[] = $value;
             } else {
diff --git a/lib/util/sfCallable.class.php b/lib/util/sfCallable.class.php
index 1251393e3..dafe85837 100644
--- a/lib/util/sfCallable.class.php
+++ b/lib/util/sfCallable.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -51,7 +52,7 @@ public function getCallable()
     public function call()
     {
         if (!is_callable($this->callable)) {
-            throw new sfException(sprintf('"%s" is not a valid callable.', is_array($this->callable) ? sprintf('%s:%s', is_object($this->callable[0]) ? get_class($this->callable[0]) : $this->callable[0], $this->callable[1]) : (is_object($this->callable) ? sprintf('Object(%s)', get_class($this->callable)) : var_export($this->callable, true))));
+            throw new \sfException(sprintf('"%s" is not a valid callable.', is_array($this->callable) ? sprintf('%s:%s', is_object($this->callable[0]) ? get_class($this->callable[0]) : $this->callable[0], $this->callable[1]) : (is_object($this->callable) ? sprintf('Object(%s)', get_class($this->callable)) : var_export($this->callable, true))));
         }
 
         $arguments = func_get_args();
diff --git a/lib/util/sfClassManipulator.class.php b/lib/util/sfClassManipulator.class.php
index 45b628b72..288ed3bee 100644
--- a/lib/util/sfClassManipulator.class.php
+++ b/lib/util/sfClassManipulator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  */
 class sfClassManipulator
 {
-    protected static $signatureTokens = array(
+    protected static $signatureTokens = [
         T_FINAL,
         T_ABSTRACT,
         T_STATIC,
@@ -25,7 +26,7 @@ class sfClassManipulator
         T_PROTECTED,
         T_PRIVATE,
         T_FUNCTION,
-    );
+    ];
 
     protected $code = '';
     protected $file = false;
@@ -45,7 +46,7 @@ public function __construct($code)
      *
      * @param string $file A file name
      *
-     * @return sfClassManipulator A sfClassManipulator instance
+     * @return \sfClassManipulator A sfClassManipulator instance
      */
     public static function fromFile($file)
     {
@@ -65,7 +66,7 @@ public static function fromFile($file)
     public function save()
     {
         if (!$this->file) {
-            throw new LogicException('Unable to save the code as no file has been provided.');
+            throw new \LogicException('Unable to save the code as no file has been provided.');
         }
 
         file_put_contents($this->file, $this->code);
@@ -242,17 +243,17 @@ protected function splitSetup($line)
                 } elseif ($inSignature && !preg_match('/\s+/', $value)) {
                     // clean up
                     preg_match('/^\s*/', $setup, $match);
-                    $before = implode('', array_map(array($this, 'getTokenValue'), $tokens)).$value.$match[0];
+                    $before = implode('', array_map([$this, 'getTokenValue'], $tokens)).$value.$match[0];
                     $setup = substr($setup, strlen($match[0]));
 
-                    return array($before, $setup);
+                    return [$before, $setup];
                 }
 
                 $setup = $value.$setup;
             }
         }
 
-        return array($before, $setup);
+        return [$before, $setup];
     }
 
     /**
diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php
index ebb6bdce8..b6db7893e 100644
--- a/lib/util/sfContext.class.php
+++ b/lib/util/sfContext.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,19 +19,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfContext implements ArrayAccess
+class sfContext implements \ArrayAccess
 {
-    /** @var sfEventDispatcher */
+    /** @var \sfEventDispatcher */
     protected $dispatcher;
 
-    /** @var sfApplicationConfiguration */
+    /** @var \sfApplicationConfiguration */
     protected $configuration;
-    protected $mailerConfiguration = array();
-    protected $serviceContainerConfiguration = array();
-    protected $factories = array();
+    protected $mailerConfiguration = [];
+    protected $serviceContainerConfiguration = [];
+    protected $factories = [];
     protected $hasShutdownUserAndStorage = false;
 
-    protected static $instances = array();
+    protected static $instances = [];
     protected static $current = 'default';
 
     /**
@@ -45,11 +45,11 @@ class sfContext implements ArrayAccess
      *
      * @return mixed The returned value of the called method
      *
-     * @throws sfException if call fails
+     * @throws \sfException if call fails
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'context.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'context.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
             $verb = substr($method, 0, 3); // get | set
             $factory = strtolower(substr($method, 3)); // factory name
@@ -61,7 +61,7 @@ public function __call($method, $arguments)
                 return $this->set($factory, $arguments[0]);
             }
 
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -70,15 +70,15 @@ public function __call($method, $arguments)
     /**
      * Creates a new context instance.
      *
-     * @param sfApplicationConfiguration $configuration An sfApplicationConfiguration instance
-     * @param string                     $name          A name for this context (application name by default)
-     * @param string                     $class         The context class to use (sfContext by default)
+     * @param \sfApplicationConfiguration $configuration An sfApplicationConfiguration instance
+     * @param string                      $name          A name for this context (application name by default)
+     * @param string                      $class         The context class to use (sfContext by default)
      *
-     * @return sfContext An sfContext instance
+     * @return \sfContext An sfContext instance
      *
-     * @throws sfFactoryException
+     * @throws \sfFactoryException
      */
-    public static function createInstance(sfApplicationConfiguration $configuration, $name = null, $class = __CLASS__)
+    public static function createInstance(\sfApplicationConfiguration $configuration, $name = null, $class = __CLASS__)
     {
         if (null === $name) {
             $name = $configuration->getApplication();
@@ -88,8 +88,8 @@ public static function createInstance(sfApplicationConfiguration $configuration,
 
         self::$instances[$name] = new $class();
 
-        if (!self::$instances[$name] instanceof sfContext) {
-            throw new sfFactoryException(sprintf('Class "%s" is not of the type sfContext.', $class));
+        if (!self::$instances[$name] instanceof \sfContext) {
+            throw new \sfFactoryException(sprintf('Class "%s" is not of the type sfContext.', $class));
         }
 
         self::$instances[$name]->initialize($configuration);
@@ -100,26 +100,26 @@ public static function createInstance(sfApplicationConfiguration $configuration,
     /**
      * Initializes the current sfContext instance.
      *
-     * @param sfApplicationConfiguration $configuration An sfApplicationConfiguration instance
+     * @param \sfApplicationConfiguration $configuration An sfApplicationConfiguration instance
      */
-    public function initialize(sfApplicationConfiguration $configuration)
+    public function initialize(\sfApplicationConfiguration $configuration)
     {
         $this->configuration = $configuration;
         $this->dispatcher = $configuration->getEventDispatcher();
 
         try {
             $this->loadFactories();
-        } catch (sfException $e) {
+        } catch (\sfException $e) {
             $e->printStackTrace();
-        } catch (Exception $e) {
-            sfException::createFromException($e)->printStackTrace();
+        } catch (\Exception $e) {
+            \sfException::createFromException($e)->printStackTrace();
         }
 
-        $this->dispatcher->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
-        $this->dispatcher->connect('response.fastcgi_finish_request', array($this, 'shutdownUserAndStorage'));
+        $this->dispatcher->connect('template.filter_parameters', [$this, 'filterTemplateParameters']);
+        $this->dispatcher->connect('response.fastcgi_finish_request', [$this, 'shutdownUserAndStorage']);
 
         // register our shutdown function
-        register_shutdown_function(array($this, 'shutdown'));
+        register_shutdown_function([$this, 'shutdown']);
     }
 
     /**
@@ -128,9 +128,9 @@ public function initialize(sfApplicationConfiguration $configuration)
      * @param string $name  the name of the sfContext to retrieve
      * @param string $class The context class to use (sfContext by default)
      *
-     * @return sfContext an sfContext implementation instance
+     * @return \sfContext an sfContext implementation instance
      *
-     * @throws sfException
+     * @throws \sfException
      */
     public static function getInstance($name = null, $class = __CLASS__)
     {
@@ -139,7 +139,7 @@ public static function getInstance($name = null, $class = __CLASS__)
         }
 
         if (!isset(self::$instances[$name])) {
-            throw new sfException(sprintf('The "%s" context does not exist.', $name));
+            throw new \sfException(sprintf('The "%s" context does not exist.', $name));
         }
 
         return self::$instances[$name];
@@ -166,24 +166,24 @@ public static function hasInstance($name = null)
      */
     public function loadFactories()
     {
-        if (sfConfig::get('sf_use_database')) {
+        if (\sfConfig::get('sf_use_database')) {
             // setup our database connections
-            $this->factories['databaseManager'] = new sfDatabaseManager($this->configuration, array('auto_shutdown' => false));
+            $this->factories['databaseManager'] = new \sfDatabaseManager($this->configuration, ['auto_shutdown' => false]);
         }
 
         // create a new action stack
-        $this->factories['actionStack'] = new sfActionStack();
+        $this->factories['actionStack'] = new \sfActionStack();
 
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
-            $timer = sfTimerManager::getTimer('Factories');
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
+            $timer = \sfTimerManager::getTimer('Factories');
         }
 
         // include the factories configuration
         require $this->configuration->getConfigCache()->checkConfig('config/factories.yml');
 
-        $this->dispatcher->notify(new sfEvent($this, 'context.load_factories'));
+        $this->dispatcher->notify(new \sfEvent($this, 'context.load_factories'));
 
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
             // @var $timer sfTimer
             $timer->addTime();
         }
@@ -205,19 +205,19 @@ public function dispatch()
     public static function switchTo($name)
     {
         if (!isset(self::$instances[$name])) {
-            $currentConfiguration = sfContext::getInstance()->getConfiguration();
-            sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration($name, $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug()));
+            $currentConfiguration = \sfContext::getInstance()->getConfiguration();
+            \sfContext::createInstance(\ProjectConfiguration::getApplicationConfiguration($name, $currentConfiguration->getEnvironment(), $currentConfiguration->isDebug()));
         }
 
         self::$current = $name;
 
-        sfContext::getInstance()->getConfiguration()->activate();
+        \sfContext::getInstance()->getConfiguration()->activate();
     }
 
     /**
      * Returns the configuration instance.
      *
-     * @return sfApplicationConfiguration The current application configuration instance
+     * @return \sfApplicationConfiguration The current application configuration instance
      */
     public function getConfiguration()
     {
@@ -227,7 +227,7 @@ public function getConfiguration()
     /**
      * Retrieves the current event dispatcher.
      *
-     * @return sfEventDispatcher An sfEventDispatcher instance
+     * @return \sfEventDispatcher An sfEventDispatcher instance
      */
     public function getEventDispatcher()
     {
@@ -252,7 +252,7 @@ public function getActionName()
     /**
      * Retrieve the ActionStack.
      *
-     * @return sfActionStack the sfActionStack instance
+     * @return \sfActionStack the sfActionStack instance
      */
     public function getActionStack()
     {
@@ -262,7 +262,7 @@ public function getActionStack()
     /**
      * Retrieve the controller.
      *
-     * @return sfFrontWebController the current sfController implementation instance
+     * @return \sfFrontWebController the current sfController implementation instance
      */
     public function getController()
     {
@@ -272,7 +272,7 @@ public function getController()
     /**
      * Retrieves the mailer.
      *
-     * @return sfMailer the current sfMailer implementation instance
+     * @return \sfMailer the current sfMailer implementation instance
      */
     public function getMailer()
     {
@@ -296,12 +296,12 @@ public function setMailerConfiguration($configuration)
     /**
      * Retrieve the logger.
      *
-     * @return sfLogger the current sfLogger implementation instance
+     * @return \sfLogger the current sfLogger implementation instance
      */
     public function getLogger()
     {
         if (!isset($this->factories['logger'])) {
-            $this->factories['logger'] = new sfNoLogger($this->dispatcher);
+            $this->factories['logger'] = new \sfNoLogger($this->dispatcher);
         }
 
         return $this->factories['logger'];
@@ -319,7 +319,7 @@ public function getLogger()
      *
      * @return mixed a database instance
      *
-     * @throws sfDatabaseException if the requested database name does not exist
+     * @throws \sfDatabaseException if the requested database name does not exist
      */
     public function getDatabaseConnection($name = 'default')
     {
@@ -333,7 +333,7 @@ public function getDatabaseConnection($name = 'default')
     /**
      * Retrieve the database manager.
      *
-     * @return sfDatabaseManager the current sfDatabaseManager instance
+     * @return \sfDatabaseManager the current sfDatabaseManager instance
      */
     public function getDatabaseManager()
     {
@@ -351,7 +351,7 @@ public function getModuleDirectory()
         // get the last action stack entry
         if (isset($this->factories['actionStack']) && $lastEntry = $this->factories['actionStack']->getLastEntry()) {
             // @var $lastEntry sfActionStackEntry
-            return sfConfig::get('sf_app_module_dir').'/'.$lastEntry->getModuleName();
+            return \sfConfig::get('sf_app_module_dir').'/'.$lastEntry->getModuleName();
         }
     }
 
@@ -373,7 +373,7 @@ public function getModuleName()
     /**
      * Retrieve the request.
      *
-     * @return sfRequest the current sfRequest implementation instance
+     * @return \sfRequest the current sfRequest implementation instance
      */
     public function getRequest()
     {
@@ -383,7 +383,7 @@ public function getRequest()
     /**
      * Retrieve the response.
      *
-     * @return sfResponse the current sfResponse implementation instance
+     * @return \sfResponse the current sfResponse implementation instance
      */
     public function getResponse()
     {
@@ -393,7 +393,7 @@ public function getResponse()
     /**
      * Set the response object.
      *
-     * @param sfResponse $response an sfResponse instance
+     * @param \sfResponse $response an sfResponse instance
      */
     public function setResponse($response)
     {
@@ -403,7 +403,7 @@ public function setResponse($response)
     /**
      * Retrieve the storage.
      *
-     * @return sfStorage the current sfStorage implementation instance
+     * @return \sfStorage the current sfStorage implementation instance
      */
     public function getStorage()
     {
@@ -413,7 +413,7 @@ public function getStorage()
     /**
      * Retrieve the view cache manager.
      *
-     * @return sfViewCacheManager the current sfViewCacheManager implementation instance
+     * @return \sfViewCacheManager the current sfViewCacheManager implementation instance
      */
     public function getViewCacheManager()
     {
@@ -423,14 +423,14 @@ public function getViewCacheManager()
     /**
      * Retrieve the i18n instance.
      *
-     * @return sfI18N the current sfI18N implementation instance
+     * @return \sfI18N the current sfI18N implementation instance
      *
-     * @throws sfConfigurationException
+     * @throws \sfConfigurationException
      */
     public function getI18N()
     {
-        if (!sfConfig::get('sf_i18n')) {
-            throw new sfConfigurationException('You must enable i18n support in your settings.yml configuration file.');
+        if (!\sfConfig::get('sf_i18n')) {
+            throw new \sfConfigurationException('You must enable i18n support in your settings.yml configuration file.');
         }
 
         return $this->factories['i18n'];
@@ -439,7 +439,7 @@ public function getI18N()
     /**
      * Retrieve the routing instance.
      *
-     * @return sfRouting the current sfRouting implementation instance
+     * @return \sfRouting the current sfRouting implementation instance
      */
     public function getRouting()
     {
@@ -449,7 +449,7 @@ public function getRouting()
     /**
      * Retrieve the user.
      *
-     * @return sfUser the current sfUser implementation instance
+     * @return \sfUser the current sfUser implementation instance
      */
     public function getUser()
     {
@@ -459,14 +459,14 @@ public function getUser()
     /**
      * Retrieves the service container.
      *
-     * @return sfServiceContainer the current sfServiceContainer implementation instance
+     * @return \sfServiceContainer the current sfServiceContainer implementation instance
      */
     public function getServiceContainer()
     {
         if (!isset($this->factories['serviceContainer'])) {
             $this->factories['serviceContainer'] = new $this->serviceContainerConfiguration['class']();
             $this->factories['serviceContainer']->setService('sf_event_dispatcher', $this->configuration->getEventDispatcher());
-            $this->factories['serviceContainer']->setService('sf_formatter', new sfFormatter());
+            $this->factories['serviceContainer']->setService('sf_formatter', new \sfFormatter());
             $this->factories['serviceContainer']->setService('sf_user', $this->getUser());
             $this->factories['serviceContainer']->setService('sf_routing', $this->getRouting());
         }
@@ -497,7 +497,7 @@ public function getService($id)
     /**
      * Returns the configuration cache.
      *
-     * @return sfConfigCache A sfConfigCache instance
+     * @return \sfConfigCache A sfConfigCache instance
      */
     public function getConfigCache()
     {
@@ -563,7 +563,7 @@ public function offsetUnset($offset)
     public function get($name)
     {
         if (!$this->has($name)) {
-            throw new sfException(sprintf('The "%s" object does not exist in the current context.', $name));
+            throw new \sfException(sprintf('The "%s" object does not exist in the current context.', $name));
         }
 
         return $this->factories[$name];
@@ -595,12 +595,12 @@ public function has($name)
     /**
      * Listens to the template.filter_parameters event.
      *
-     * @param sfEvent $event      An sfEvent instance
-     * @param array   $parameters An array of template parameters to filter
+     * @param \sfEvent $event      An sfEvent instance
+     * @param array    $parameters An array of template parameters to filter
      *
      * @return array The filtered parameters array
      */
-    public function filterTemplateParameters(sfEvent $event, $parameters)
+    public function filterTemplateParameters(\sfEvent $event, $parameters)
     {
         $parameters['sf_context'] = $this;
         $parameters['sf_request'] = $this->factories['request'];
@@ -637,11 +637,11 @@ public function shutdown()
             $this->getRouting()->shutdown();
         }
 
-        if (sfConfig::get('sf_use_database')) {
+        if (\sfConfig::get('sf_use_database')) {
             $this->getDatabaseManager()->shutdown();
         }
 
-        if (sfConfig::get('sf_logging_enabled')) {
+        if (\sfConfig::get('sf_logging_enabled')) {
             $this->getLogger()->shutdown();
         }
     }
diff --git a/lib/util/sfDomCssSelector.class.php b/lib/util/sfDomCssSelector.class.php
index 2d523ef1a..e2075ab6d 100644
--- a/lib/util/sfDomCssSelector.class.php
+++ b/lib/util/sfDomCssSelector.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,16 +21,16 @@
  *
  * @version    SVN: $Id$
  */
-class sfDomCssSelector implements Countable, Iterator
+class sfDomCssSelector implements \Countable, \Iterator
 {
-    public $nodes = array();
+    public $nodes = [];
 
     private $count;
 
     public function __construct($nodes)
     {
         if (!is_array($nodes)) {
-            $nodes = array($nodes);
+            $nodes = [$nodes];
         }
 
         $this->nodes = $nodes;
@@ -52,7 +53,7 @@ public function getValue()
 
     public function getValues()
     {
-        $values = array();
+        $values = [];
         foreach ($this->nodes as $node) {
             $values[] = $node->nodeValue;
         }
@@ -64,14 +65,14 @@ public function matchSingle($selector)
     {
         $nodes = $this->getElements($selector);
 
-        return $nodes ? new sfDomCssSelector($nodes[0]) : new sfDomCssSelector(array());
+        return $nodes ? new \sfDomCssSelector($nodes[0]) : new \sfDomCssSelector([]);
     }
 
     public function matchAll($selector)
     {
         $nodes = $this->getElements($selector);
 
-        return $nodes ? new sfDomCssSelector($nodes) : new sfDomCssSelector(array());
+        return $nodes ? new \sfDomCssSelector($nodes) : new \sfDomCssSelector([]);
     }
 
     /**
@@ -145,7 +146,7 @@ public function count()
 
     protected function getElements($selector)
     {
-        $nodes = array();
+        $nodes = [];
         foreach ($this->nodes as $node) {
             $result_nodes = $this->getElementsForNode($selector, $node);
             if ($result_nodes) {
@@ -162,9 +163,9 @@ protected function getElements($selector)
 
     protected function getElementsForNode($selector, $root_node)
     {
-        $all_nodes = array();
+        $all_nodes = [];
         foreach ($this->tokenize_selectors($selector) as $selector) {
-            $nodes = array($root_node);
+            $nodes = [$root_node];
             foreach ($this->tokenize($selector) as $token) {
                 $combinator = $token['combinator'];
                 $selector = $token['selector'];
@@ -176,15 +177,15 @@ protected function getElementsForNode($selector, $root_node)
                     // Token is an ID selector
                     $tagName = substr($token, 0, $pos);
                     $id = substr($token, $pos + 1);
-                    $xpath = new DOMXPath($root_node);
+                    $xpath = new \DOMXPath($root_node);
                     $element = $xpath->query(sprintf("//*[@id = '%s']", $id))->item(0);
                     if (!$element || ($tagName && strtolower($element->nodeName) != $tagName)) {
                         // tag with that ID not found
-                        return array();
+                        return [];
                     }
 
                     // Set nodes to contain just this element
-                    $nodes = array($element);
+                    $nodes = [$element];
                     $nodes = $this->matchMultipleCustomSelectors($nodes, $selector);
 
                     continue; // Skip to next token
@@ -201,7 +202,7 @@ protected function getElementsForNode($selector, $root_node)
 
                     // Get elements matching tag, filter them for class selector
                     $founds = $this->getElementsByTagName($nodes, $tagName, $combinator);
-                    $nodes = array();
+                    $nodes = [];
                     foreach ($founds as $found) {
                         if (preg_match('/(^|\s+)'.$className.'($|\s+)/', $found->getAttribute('class'))) {
                             $nodes[] = $found;
@@ -231,7 +232,7 @@ protected function getElementsForNode($selector, $root_node)
 
                     // Grab all of the tagName elements within current node
                     $founds = $this->getElementsByTagName($nodes, $tagName, $combinator);
-                    $nodes = array();
+                    $nodes = [];
                     foreach ($founds as $found) {
                         $ok = false;
                         foreach ($matches as $match) {
@@ -256,7 +257,7 @@ protected function getElementsForNode($selector, $root_node)
                                     break;
 
                                 case '^': // Match starts with value
-                                    $ok = 0 === strpos($found->getAttribute($attrName), $attrValue);
+                                    $ok =   str_starts_with($found->getAttribute($attrName), $attrValue);
 
                                     break;
 
@@ -266,7 +267,7 @@ protected function getElementsForNode($selector, $root_node)
                                     break;
 
                                 case '*': // Match ends with value
-                                    $ok = false !== strpos($found->getAttribute($attrName), $attrValue);
+                                    $ok =   str_contains($found->getAttribute($attrName), $attrValue);
 
                                     break;
 
@@ -307,7 +308,7 @@ protected function getElementsForNode($selector, $root_node)
 
     protected function getElementsByTagName($nodes, $tagName, $combinator = ' ')
     {
-        $founds = array();
+        $founds = [];
         foreach ($nodes as $node) {
             switch ($combinator) {
                 case ' ':
@@ -342,7 +343,7 @@ protected function getElementsByTagName($nodes, $tagName, $combinator = ' ')
                     break;
 
                 default:
-                    throw new Exception(sprintf('Unrecognized combinator "%s".', $combinator));
+                    throw new \Exception(sprintf('Unrecognized combinator "%s".', $combinator));
             }
         }
 
@@ -352,7 +353,7 @@ protected function getElementsByTagName($nodes, $tagName, $combinator = ' ')
     protected function tokenize_selectors($selector)
     {
         // split tokens by , except in an attribute selector
-        $tokens = array();
+        $tokens = [];
         $quoted = false;
         $token = '';
         for ($i = 0, $max = strlen($selector); $i < $max; ++$i) {
@@ -376,10 +377,10 @@ protected function tokenize_selectors($selector)
     protected function tokenize($selector)
     {
         // split tokens by space except if space is in an attribute selector
-        $tokens = array();
-        $combinators = array(' ', '>', '+');
+        $tokens = [];
+        $combinators = [' ', '>', '+'];
         $quoted = false;
-        $token = array('combinator' => ' ', 'name' => '');
+        $token = ['combinator' => ' ', 'name' => ''];
         for ($i = 0, $max = strlen($selector); $i < $max; ++$i) {
             if (in_array($selector[$i], $combinators) && !$quoted) {
                 // remove all whitespaces around the combinator
@@ -391,7 +392,7 @@ protected function tokenize($selector)
                 }
 
                 $tokens[] = $token;
-                $token = array('combinator' => $combinator, 'name' => '');
+                $token = ['combinator' => $combinator, 'name' => ''];
             } elseif ('"' == $selector[$i]) {
                 $token['name'] .= $selector[$i];
                 $quoted = $quoted ? false : true;
@@ -433,7 +434,7 @@ protected function tokenize_selector_name($token_name)
             }
         }
 
-        return array($name, $selector);
+        return [$name, $selector];
     }
 
     protected function matchMultipleCustomSelectors($nodes, $selector)
@@ -456,11 +457,11 @@ protected function matchCustomSelector($nodes, $selector)
         }
 
         $selector = $this->tokenize_custom_selector($selector);
-        $matchingNodes = array();
+        $matchingNodes = [];
         for ($i = 0, $max = count($nodes); $i < $max; ++$i) {
             switch ($selector['selector']) {
                 case 'contains':
-                    if (false !== strpos($nodes[$i]->textContent, $selector['parameter'])) {
+                    if (str_contains($nodes[$i]->textContent, $selector['parameter'])) {
                         $matchingNodes[] = $nodes[$i];
                     }
 
@@ -538,7 +539,7 @@ protected function matchCustomSelector($nodes, $selector)
                     break;
 
                 default:
-                    throw new Exception(sprintf('Unrecognized selector "%s".', $selector['selector']));
+                    throw new \Exception(sprintf('Unrecognized selector "%s".', $selector['selector']));
             }
         }
 
@@ -560,7 +561,7 @@ protected function split_custom_selector($selectors)
         \)
       )?
     /x', $selectors, $matches, PREG_PATTERN_ORDER)) {
-            throw new Exception(sprintf('Unable to split custom selector "%s".', $selectors));
+            throw new \Exception(sprintf('Unable to split custom selector "%s".', $selectors));
         }
 
         return $matches[0];
@@ -580,10 +581,10 @@ protected function tokenize_custom_selector($selector)
         \)
       )?
     /x', substr($selector, 1), $matches)) {
-            throw new Exception(sprintf('Unable to parse custom selector "%s".', $selector));
+            throw new \Exception(sprintf('Unable to parse custom selector "%s".', $selector));
         }
 
-        return array('selector' => $matches[1], 'parameter' => isset($matches[3]) ? ($matches[3] ?: $matches[4]) : '');
+        return ['selector' => $matches[1], 'parameter' => isset($matches[3]) ? ($matches[3] ?: $matches[4]) : ''];
     }
 
     protected function nth($cur, $result = 1, $dir = 'nextSibling')
diff --git a/lib/util/sfFinder.class.php b/lib/util/sfFinder.class.php
index 48b7d52cd..d47d3b39c 100644
--- a/lib/util/sfFinder.class.php
+++ b/lib/util/sfFinder.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -28,12 +29,12 @@
 class sfFinder
 {
     protected $type = 'file';
-    protected $names = array();
-    protected $prunes = array();
-    protected $discards = array();
-    protected $execs = array();
+    protected $names = [];
+    protected $prunes = [];
+    protected $discards = [];
+    protected $execs = [];
     protected $mindepth = 0;
-    protected $sizes = array();
+    protected $sizes = [];
     protected $maxdepth = 1000000;
     protected $relative = false;
     protected $follow_link = false;
@@ -47,7 +48,7 @@ class sfFinder
      *
      * @param int $level
      *
-     * @return sfFinder current sfFinder object
+     * @return \sfFinder current sfFinder object
      */
     public function maxdepth($level)
     {
@@ -63,7 +64,7 @@ public function maxdepth($level)
      *
      * @param int $level
      *
-     * @return sfFinder current sfFinder object
+     * @return \sfFinder current sfFinder object
      */
     public function mindepth($level)
     {
@@ -82,7 +83,7 @@ public function get_type()
      *
      * @param string $name directory or file or any (for both file and directory)
      *
-     * @return sfFinder new sfFinder object
+     * @return \sfFinder new sfFinder object
      */
     public static function type($name)
     {
@@ -96,7 +97,7 @@ public static function type($name)
      *
      * @param string $name directory or file or any (for both file and directory)
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function setType($name)
     {
@@ -127,9 +128,9 @@ public function setType($name)
      * $finder->name('/\.php$/') // same as above
      * $finder->name('test.php')
      *
-     * @param  list   a list of patterns, globs or strings
+     * @param  \list   a list of patterns, globs or strings
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function name()
     {
@@ -144,9 +145,9 @@ public function name()
      *
      * @see    ->name()
      *
-     * @param  list   a list of patterns, globs or strings
+     * @param  \list   a list of patterns, globs or strings
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function not_name()
     {
@@ -163,16 +164,16 @@ public function not_name()
      * $finder->size('<= 1Ki');
      * $finder->size(4);
      *
-     * @param  list   a list of comparison strings
+     * @param  \list   a list of comparison strings
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function size()
     {
         $args = func_get_args();
         $numargs = count($args);
         for ($i = 0; $i < $numargs; ++$i) {
-            $this->sizes[] = new sfNumberCompare($args[$i]);
+            $this->sizes[] = new \sfNumberCompare($args[$i]);
         }
 
         return $this;
@@ -181,9 +182,9 @@ public function size()
     /**
      * Traverses no further.
      *
-     * @param  list   a list of patterns, globs to match
+     * @param  \list   a list of patterns, globs to match
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function prune()
     {
@@ -196,9 +197,9 @@ public function prune()
     /**
      * Discards elements that matches.
      *
-     * @param  list   a list of patterns, globs to match
+     * @param  \list   a list of patterns, globs to match
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function discard()
     {
@@ -215,7 +216,7 @@ public function discard()
      *
      * @param bool $ignore falase when version control directories shall be included (default is true)
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function ignore_version_control($ignore = true)
     {
@@ -227,7 +228,7 @@ public function ignore_version_control($ignore = true)
     /**
      * Returns files and directories ordered by name.
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function sort_by_name()
     {
@@ -239,7 +240,7 @@ public function sort_by_name()
     /**
      * Returns files and directories ordered by type (directories before files), then by name.
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function sort_by_type()
     {
@@ -258,7 +259,7 @@ public function sort_by_type()
      *
      * @param  mixed  function or method to call
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function exec()
     {
@@ -266,10 +267,10 @@ public function exec()
         $numargs = count($args);
         for ($i = 0; $i < $numargs; ++$i) {
             if (is_array($args[$i]) && !method_exists($args[$i][0], $args[$i][1])) {
-                throw new sfException(sprintf('method "%s" does not exist for object "%s".', $args[$i][1], $args[$i][0]));
+                throw new \sfException(sprintf('method "%s" does not exist for object "%s".', $args[$i][1], $args[$i][0]));
             }
             if (!is_array($args[$i]) && !function_exists($args[$i])) {
-                throw new sfException(sprintf('function "%s" does not exist.', $args[$i]));
+                throw new \sfException(sprintf('function "%s" does not exist.', $args[$i]));
             }
 
             $this->execs[] = $args[$i];
@@ -281,7 +282,7 @@ public function exec()
     /**
      * Returns relative paths for all files and directories.
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function relative()
     {
@@ -293,7 +294,7 @@ public function relative()
     /**
      * Symlink following.
      *
-     * @return sfFinder Current object
+     * @return \sfFinder Current object
      */
     public function follow_link()
     {
@@ -309,13 +310,13 @@ public function follow_link()
      */
     public function in()
     {
-        $files = array();
+        $files = [];
         $here_dir = getcwd();
 
         $finder = clone $this;
 
         if ($this->ignore_version_control) {
-            $ignores = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg');
+            $ignores = ['.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg'];
 
             $finder->discard($ignores)->prune($ignores);
         }
@@ -380,20 +381,20 @@ protected function to_regex($str)
             return $str;
         }
 
-        return sfGlobToRegex::glob_to_regex($str);
+        return \sfGlobToRegex::glob_to_regex($str);
     }
 
     protected function args_to_array($arg_list, $not = false)
     {
-        $list = array();
+        $list = [];
         $nbArgList = count($arg_list);
         for ($i = 0; $i < $nbArgList; ++$i) {
             if (is_array($arg_list[$i])) {
                 foreach ($arg_list[$i] as $arg) {
-                    $list[] = array($not, $this->to_regex($arg));
+                    $list[] = [$not, $this->to_regex($arg)];
                 }
             } else {
-                $list[] = array($not, $this->to_regex($arg_list[$i]));
+                $list[] = [$not, $this->to_regex($arg_list[$i])];
             }
         }
 
@@ -403,18 +404,18 @@ protected function args_to_array($arg_list, $not = false)
     protected function search_in($dir, $depth = 0)
     {
         if ($depth > $this->maxdepth) {
-            return array();
+            return [];
         }
 
         $dir = realpath($dir);
 
         if ((!$this->follow_link) && is_link($dir)) {
-            return array();
+            return [];
         }
 
-        $files = array();
-        $temp_files = array();
-        $temp_folders = array();
+        $files = [];
+        $temp_files = [];
+        $temp_folders = [];
         if (is_dir($dir) && is_readable($dir)) {
             $current_dir = opendir($dir);
             while (false !== $entryname = readdir($current_dir)) {
@@ -567,7 +568,7 @@ protected function exec_ok($dir, $entry)
         }
 
         foreach ($this->execs as $exec) {
-            if (!call_user_func_array($exec, array($dir, $entry))) {
+            if (!call_user_func_array($exec, [$dir, $entry])) {
                 return false;
             }
         }
@@ -717,7 +718,7 @@ public function __construct($test)
     public function test($number)
     {
         if (!preg_match('{^([<>]=?)?(.*?)([kmg]i?)?$}i', $this->test, $matches)) {
-            throw new sfException(sprintf('don\'t understand "%s" as a test.', $this->test));
+            throw new \sfException(sprintf('don\'t understand "%s" as a test.', $this->test));
         }
 
         $target = array_key_exists(2, $matches) ? $matches[2] : '';
diff --git a/lib/util/sfInflector.class.php b/lib/util/sfInflector.class.php
index f79a3c11b..dadc36fba 100644
--- a/lib/util/sfInflector.class.php
+++ b/lib/util/sfInflector.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -25,7 +26,7 @@ class sfInflector
      */
     public static function camelize($lower_case_and_underscored_word)
     {
-        return strtr(ucwords(strtr((string) $lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+        return strtr(ucwords(strtr((string) $lower_case_and_underscored_word, ['/' => ':: ', '_' => ' ', '-' => ' '])), [' ' => '']);
     }
 
     /**
@@ -39,8 +40,8 @@ public static function underscore($camel_cased_word)
     {
         $tmp = (string) $camel_cased_word;
         $tmp = str_replace('::', '/', $tmp);
-        $tmp = sfToolkit::pregtr($tmp, array('/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2',
-            '/([a-z\d])([A-Z])/' => '\\1_\\2'));
+        $tmp = \sfToolkit::pregtr($tmp, ['/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2',
+            '/([a-z\d])([A-Z])/' => '\\1_\\2']);
 
         return strtolower($tmp);
     }
@@ -68,7 +69,7 @@ public static function demodulize($class_name_in_module)
      */
     public static function foreign_key($class_name, $separate_with_underscore = true)
     {
-        return sfInflector::underscore(sfInflector::demodulize($class_name)).($separate_with_underscore ? '_id' : 'id');
+        return \sfInflector::underscore(\sfInflector::demodulize($class_name)).($separate_with_underscore ? '_id' : 'id');
     }
 
     /**
@@ -80,7 +81,7 @@ public static function foreign_key($class_name, $separate_with_underscore = true
      */
     public static function tableize($class_name)
     {
-        return sfInflector::underscore($class_name);
+        return \sfInflector::underscore($class_name);
     }
 
     /**
@@ -92,7 +93,7 @@ public static function tableize($class_name)
      */
     public static function classify($table_name)
     {
-        return sfInflector::camelize($table_name);
+        return \sfInflector::camelize($table_name);
     }
 
     /**
diff --git a/lib/util/sfNamespacedParameterHolder.class.php b/lib/util/sfNamespacedParameterHolder.class.php
index f792bb2eb..33b21c04d 100644
--- a/lib/util/sfNamespacedParameterHolder.class.php
+++ b/lib/util/sfNamespacedParameterHolder.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,10 +21,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfNamespacedParameterHolder extends sfParameterHolder
+class sfNamespacedParameterHolder extends \sfParameterHolder
 {
     protected $default_namespace;
-    protected $parameters = array();
+    protected $parameters = [];
 
     /**
      * The constructor for sfNamespacedParameterHolder.
@@ -50,7 +50,7 @@ public function __construct($namespace = 'symfony/default')
      */
     public function __serialize()
     {
-        return array($this->default_namespace, $this->parameters);
+        return [$this->default_namespace, $this->parameters];
     }
 
     /**
@@ -99,7 +99,7 @@ public function getDefaultNamespace()
     public function clear()
     {
         $this->parameters = null;
-        $this->parameters = array();
+        $this->parameters = [];
     }
 
     /**
@@ -147,7 +147,7 @@ public function getNames($ns = null)
             return array_keys($this->parameters[$ns]);
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -178,7 +178,7 @@ public function &getAll($ns = null)
             $ns = $this->default_namespace;
         }
 
-        $parameters = array();
+        $parameters = [];
 
         if (isset($this->parameters[$ns])) {
             $parameters = $this->parameters[$ns];
@@ -246,7 +246,7 @@ public function remove($name, $default = null, $ns = null)
      *
      * @param string $ns a parameter namespace
      *
-     * @return mixed|null
+     * @return \mixed|null
      */
     public function &removeNamespace($ns = null)
     {
@@ -280,7 +280,7 @@ public function set($name, $value, $ns = null)
         }
 
         if (!isset($this->parameters[$ns])) {
-            $this->parameters[$ns] = array();
+            $this->parameters[$ns] = [];
         }
 
         $this->parameters[$ns][$name] = $value;
@@ -302,7 +302,7 @@ public function setByRef($name, &$value, $ns = null)
         }
 
         if (!isset($this->parameters[$ns])) {
-            $this->parameters[$ns] = array();
+            $this->parameters[$ns] = [];
         }
 
         $this->parameters[$ns][$name] = &$value;
@@ -328,7 +328,7 @@ public function add($parameters, $ns = null)
         }
 
         if (!isset($this->parameters[$ns])) {
-            $this->parameters[$ns] = array();
+            $this->parameters[$ns] = [];
         }
 
         foreach ($parameters as $key => $value) {
@@ -352,7 +352,7 @@ public function addByRef(&$parameters, $ns = null)
         }
 
         if (!isset($this->parameters[$ns])) {
-            $this->parameters[$ns] = array();
+            $this->parameters[$ns] = [];
         }
 
         foreach ($parameters as $key => &$value) {
diff --git a/lib/util/sfParameterHolder.class.php b/lib/util/sfParameterHolder.class.php
index 0e643a5a2..9f7f38bce 100644
--- a/lib/util/sfParameterHolder.class.php
+++ b/lib/util/sfParameterHolder.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,9 +20,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfParameterHolder implements Serializable
+class sfParameterHolder implements \Serializable
 {
-    protected $parameters = array();
+    protected $parameters = [];
 
     /**
      * The constructor for sfParameterHolder.
@@ -56,7 +56,7 @@ public function __unserialize($data)
      */
     public function clear()
     {
-        $this->parameters = array();
+        $this->parameters = [];
     }
 
     /**
diff --git a/lib/util/sfToolkit.class.php b/lib/util/sfToolkit.class.php
index 03d17919a..a048d290a 100644
--- a/lib/util/sfToolkit.class.php
+++ b/lib/util/sfToolkit.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -58,7 +58,7 @@ public static function clearDirectory($directory)
         $fp = opendir($directory);
 
         // ignore names
-        $ignore = array('.', '..', 'CVS', '.svn');
+        $ignore = ['.', '..', 'CVS', '.svn'];
 
         while (($file = readdir($fp)) !== false) {
             if (!in_array($file, $ignore)) {
@@ -142,7 +142,7 @@ public static function stripComments($source)
             return $source;
         }
 
-        $ignore = array(T_COMMENT => true, T_DOC_COMMENT => true);
+        $ignore = [T_COMMENT => true, T_DOC_COMMENT => true];
         $output = '';
 
         foreach (token_get_all($source) as $token) {
@@ -171,7 +171,7 @@ public static function stripComments($source)
      */
     public static function stripslashesDeep($value)
     {
-        return is_array($value) ? array_map(array('sfToolkit', 'stripslashesDeep'), $value) : stripslashes($value);
+        return is_array($value) ? array_map(['sfToolkit', 'stripslashesDeep'], $value) : stripslashes($value);
     }
 
     // code from php at moechofe dot com (array_merge comment on php.net)
@@ -204,7 +204,7 @@ public static function arrayDeepMerge()
 
             case 2:
                 $args = func_get_args();
-                $args[2] = array();
+                $args[2] = [];
                 if (is_array($args[0]) && is_array($args[1])) {
                     foreach (array_unique(array_merge(array_keys($args[0]), array_keys($args[1]))) as $key) {
                         $isKey0 = array_key_exists($key, $args[0]);
@@ -227,10 +227,10 @@ public static function arrayDeepMerge()
 
             default:
                 $args = func_get_args();
-                $args[1] = sfToolkit::arrayDeepMerge($args[0], $args[1]);
+                $args[1] = \sfToolkit::arrayDeepMerge($args[0], $args[1]);
                 array_shift($args);
 
-                return call_user_func_array(array('sfToolkit', 'arrayDeepMerge'), $args);
+                return call_user_func_array(['sfToolkit', 'arrayDeepMerge'], $args);
 
                 break;
         }
@@ -256,7 +256,7 @@ public static function stringToArray($string)
       )
     /x', (string) $string, $matches, PREG_SET_ORDER);
 
-        $attributes = array();
+        $attributes = [];
         foreach ($matches as $val) {
             $attributes[$val[1]] = self::literalize($val[3]);
         }
@@ -276,11 +276,11 @@ public static function literalize($value, $quoted = false)
         $value = trim($value);
         $lvalue = strtolower($value);
 
-        if (in_array($lvalue, array('null', '~', ''))) {
+        if (in_array($lvalue, ['null', '~', ''])) {
             $value = null;
-        } elseif (in_array($lvalue, array('true', 'on', '+', 'yes'))) {
+        } elseif (in_array($lvalue, ['true', 'on', '+', 'yes'])) {
             $value = true;
-        } elseif (in_array($lvalue, array('false', 'off', '-', 'no'))) {
+        } elseif (in_array($lvalue, ['false', 'off', '-', 'no'])) {
             $value = false;
         } elseif (ctype_digit($value)) {
             $value = (int) $value;
@@ -310,7 +310,7 @@ public static function replaceConstants($value)
         }
 
         return preg_replace_callback('/%(.+?)%/', function ($v) {
-            return sfConfig::has(strtolower($v[1])) ? sfConfig::get(strtolower($v[1])) : '%'.$v[1].'%';
+            return \sfConfig::has(strtolower($v[1])) ? \sfConfig::get(strtolower($v[1])) : '%'.$v[1].'%';
         }, $value);
     }
 
@@ -440,13 +440,13 @@ public static function getArrayValueForPath($values, $name, $default = null)
      *
      * @return string
      *
-     * @throws sfException If no php cli found
+     * @throws \sfException If no php cli found
      */
     public static function getPhpCli()
     {
         $path = getenv('PATH') ?: getenv('Path');
-        $suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : array('.exe', '.bat', '.cmd', '.com')) : array('');
-        foreach (array('php5', 'php') as $phpCli) {
+        $suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : ['.exe', '.bat', '.cmd', '.com']) : [''];
+        foreach (['php5', 'php'] as $phpCli) {
             foreach ($suffixes as $suffix) {
                 foreach (explode(PATH_SEPARATOR, $path) as $dir) {
                     if (is_file($file = $dir.DIRECTORY_SEPARATOR.$phpCli.$suffix) && is_executable($file)) {
@@ -456,7 +456,7 @@ public static function getPhpCli()
             }
         }
 
-        throw new sfException('Unable to find PHP executable.');
+        throw new \sfException('Unable to find PHP executable.');
     }
 
     /**
@@ -540,7 +540,7 @@ public static function addIncludePath($path, $position = 'front')
                 break;
 
             default:
-                throw new InvalidArgumentException(sprintf('Unrecognized position: "%s"', $position));
+                throw new \InvalidArgumentException(sprintf('Unrecognized position: "%s"', $position));
         }
 
         return set_include_path(implode(PATH_SEPARATOR, $paths));
diff --git a/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php b/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
index 925588ef6..a72e24391 100644
--- a/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
+++ b/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorI18nChoiceCountry extends sfValidatorChoice
+class sfValidatorI18nChoiceCountry extends \sfValidatorChoice
 {
     /**
      * Configures the current validator.
@@ -27,21 +28,21 @@ class sfValidatorI18nChoiceCountry extends sfValidatorChoice
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorChoice
+     * @see \sfValidatorChoice
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
         $this->addOption('countries');
 
         // populate choices with all countries
-        $countries = array_keys(sfCultureInfo::getInstance()->getCountries());
+        $countries = array_keys(\sfCultureInfo::getInstance()->getCountries());
 
         // restrict countries to a sub-set
         if (isset($options['countries'])) {
             if ($problems = array_diff($options['countries'], $countries)) {
-                throw new InvalidArgumentException(sprintf('The following countries do not exist: %s.', implode(', ', $problems)));
+                throw new \InvalidArgumentException(sprintf('The following countries do not exist: %s.', implode(', ', $problems)));
             }
 
             $countries = $options['countries'];
diff --git a/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php b/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
index 7ecc6cd4e..4738aa609 100644
--- a/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
+++ b/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorI18nChoiceLanguage extends sfValidatorChoice
+class sfValidatorI18nChoiceLanguage extends \sfValidatorChoice
 {
     /**
      * Configures the current validator.
@@ -27,21 +28,21 @@ class sfValidatorI18nChoiceLanguage extends sfValidatorChoice
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorChoice
+     * @see \sfValidatorChoice
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
         $this->addOption('languages');
 
         // populate choices with all languages
-        $languages = array_keys(sfCultureInfo::getInstance()->getLanguages());
+        $languages = array_keys(\sfCultureInfo::getInstance()->getLanguages());
 
         // restrict languages to a sub-set
         if (isset($options['languages'])) {
             if ($problems = array_diff($options['languages'], $languages)) {
-                throw new InvalidArgumentException(sprintf('The following languages do not exist: %s.', implode(', ', $problems)));
+                throw new \InvalidArgumentException(sprintf('The following languages do not exist: %s.', implode(', ', $problems)));
             }
 
             $languages = $options['languages'];
diff --git a/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php b/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
index a0a8b56a8..d2722dc52 100644
--- a/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
+++ b/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorI18nChoiceTimezone extends sfValidatorChoice
+class sfValidatorI18nChoiceTimezone extends \sfValidatorChoice
 {
     /**
      * Configures the current validator.
@@ -25,12 +26,12 @@ class sfValidatorI18nChoiceTimezone extends sfValidatorChoice
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorChoice
+     * @see \sfValidatorChoice
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
-        $this->setOption('choices', array_keys(sfCultureInfo::getInstance()->getTimeZones()));
+        $this->setOption('choices', array_keys(\sfCultureInfo::getInstance()->getTimeZones()));
     }
 }
diff --git a/lib/validator/sfValidatedFile.class.php b/lib/validator/sfValidatedFile.class.php
index 703d00efd..568df1ecf 100644
--- a/lib/validator/sfValidatedFile.class.php
+++ b/lib/validator/sfValidatedFile.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -65,7 +66,7 @@ public function __toString()
      *
      * @return string The filename without the $this->path prefix
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function save($file = null, $fileMode = 0666, $create = true, $dirMode = 0777)
     {
@@ -75,7 +76,7 @@ public function save($file = null, $fileMode = 0666, $create = true, $dirMode =
 
         if ('/' != $file[0] && '\\' != $file[0] && !(strlen($file) > 3 && ctype_alpha($file[0]) && ':' == $file[1] && ('\\' == $file[2] || '/' == $file[2]))) {
             if (null === $this->path) {
-                throw new RuntimeException('You must give a "path" when you give a relative file name.');
+                throw new \RuntimeException('You must give a "path" when you give a relative file name.');
             }
 
             $file = $this->path.DIRECTORY_SEPARATOR.$file;
@@ -96,12 +97,12 @@ public function save($file = null, $fileMode = 0666, $create = true, $dirMode =
 
         if (!is_dir($directory)) {
             // the directory path exists but it's not a directory
-            throw new Exception(sprintf('File upload path "%s" exists, but is not a directory.', $directory));
+            throw new \Exception(sprintf('File upload path "%s" exists, but is not a directory.', $directory));
         }
 
         if (!is_writable($directory)) {
             // the directory isn't writable
-            throw new Exception(sprintf('File upload path "%s" is not writable.', $directory));
+            throw new \Exception(sprintf('File upload path "%s" is not writable.', $directory));
         }
 
         // copy the temp file to the destination file
@@ -214,7 +215,7 @@ public function getType()
      *
      * @param string $type
      *
-     * @return sfValidatedFile
+     * @return \sfValidatedFile
      */
     public function resetType($type)
     {
@@ -243,7 +244,7 @@ public function getSize()
      */
     protected function getExtensionFromType($type, $default = '')
     {
-        static $extensions = array(
+        static $extensions = [
             'application/andrew-inset' => 'ez',
             'application/appledouble' => 'base64',
             'application/applefile' => 'base64',
@@ -655,7 +656,7 @@ protected function getExtensionFromType($type, $default = '')
             'x-world/x-svr' => 'svr',
             'x-world/x-vream' => 'vrw',
             'x-world/x-vrml' => 'wrl',
-        );
+        ];
 
         return !$type ? $default : (isset($extensions[$type]) ? '.'.$extensions[$type] : $default);
     }
diff --git a/lib/validator/sfValidatorAnd.class.php b/lib/validator/sfValidatorAnd.class.php
index 24c9e45d4..38dd7bc8c 100644
--- a/lib/validator/sfValidatorAnd.class.php
+++ b/lib/validator/sfValidatorAnd.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorAnd extends sfValidatorBase
+class sfValidatorAnd extends \sfValidatorBase
 {
-    protected $validators = array();
+    protected $validators = [];
 
     /**
      * Constructor.
@@ -32,18 +33,18 @@ class sfValidatorAnd extends sfValidatorBase
      * @param array $options    An array of options
      * @param array $messages   An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($validators = null, $options = array(), $messages = array())
+    public function __construct($validators = null, $options = [], $messages = [])
     {
-        if ($validators instanceof sfValidatorBase) {
+        if ($validators instanceof \sfValidatorBase) {
             $this->addValidator($validators);
         } elseif (is_array($validators)) {
             foreach ($validators as $validator) {
                 $this->addValidator($validator);
             }
         } elseif (null !== $validators) {
-            throw new InvalidArgumentException('sfValidatorAnd constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
+            throw new \InvalidArgumentException('sfValidatorAnd constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
         }
 
         parent::__construct($options, $messages);
@@ -52,9 +53,9 @@ public function __construct($validators = null, $options = array(), $messages =
     /**
      * Adds a validator.
      *
-     * @param sfValidatorBase $validator A sfValidatorBase instance
+     * @param \sfValidatorBase $validator A sfValidatorBase instance
      */
-    public function addValidator(sfValidatorBase $validator)
+    public function addValidator(\sfValidatorBase $validator)
     {
         $this->validators[] = $validator;
     }
@@ -70,7 +71,7 @@ public function getValidators()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function asString($indent = 0)
     {
@@ -89,8 +90,8 @@ public function asString($indent = 0)
                 if ($options || $messages) {
                     $validators .= sprintf(
                         '(%s%s)',
-                        $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-                        $messages ? ', '.sfYamlInline::dump($messages) : ''
+                        $options ? \sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+                        $messages ? ', '.\sfYamlInline::dump($messages) : ''
                     );
                 }
             }
@@ -109,9 +110,9 @@ public function asString($indent = 0)
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addOption('halt_on_error', false);
 
@@ -119,16 +120,16 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         $clean = $value;
-        $errors = new sfValidatorErrorSchema($this);
+        $errors = new \sfValidatorErrorSchema($this);
         foreach ($this->validators as $validator) {
             try {
                 $clean = $validator->clean($clean);
-            } catch (sfValidatorError $e) {
+            } catch (\sfValidatorError $e) {
                 $errors->addError($e);
 
                 if ($this->getOption('halt_on_error')) {
@@ -139,7 +140,7 @@ protected function doClean($value)
 
         if ($errors->count()) {
             if ($this->getMessage('invalid')) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
 
             throw $errors;
diff --git a/lib/validator/sfValidatorBase.class.php b/lib/validator/sfValidatorBase.class.php
index ec150533d..6cab8813d 100644
--- a/lib/validator/sfValidatorBase.class.php
+++ b/lib/validator/sfValidatorBase.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,13 +21,13 @@
 abstract class sfValidatorBase
 {
     protected static $charset = 'UTF-8';
-    protected static $globalDefaultMessages = array('invalid' => 'Invalid.', 'required' => 'Required.');
+    protected static $globalDefaultMessages = ['invalid' => 'Invalid.', 'required' => 'Required.'];
 
-    protected $requiredOptions = array();
-    protected $defaultMessages = array();
-    protected $defaultOptions = array();
-    protected $messages = array();
-    protected $options = array();
+    protected $requiredOptions = [];
+    protected $defaultMessages = [];
+    protected $defaultOptions = [];
+    protected $messages = [];
+    protected $options = [];
 
     /**
      * Constructor.
@@ -45,10 +46,10 @@ abstract class sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      */
-    public function __construct($options = array(), $messages = array())
+    public function __construct($options = [], $messages = [])
     {
-        $this->options = array_merge(array('required' => true, 'trim' => true, 'empty_value' => null), $this->options);
-        $this->messages = array_merge(array('required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']), $this->messages);
+        $this->options = array_merge(['required' => true, 'trim' => true, 'empty_value' => null], $this->options);
+        $this->messages = array_merge(['required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']], $this->messages);
 
         $this->configure($options, $messages);
 
@@ -60,17 +61,17 @@ public function __construct($options = array(), $messages = array())
 
         // check option names
         if ($diff = array_diff($optionKeys, array_merge($currentOptionKeys, $this->requiredOptions))) {
-            throw new InvalidArgumentException(sprintf('%s does not support the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+            throw new \InvalidArgumentException(sprintf('%s does not support the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
         }
 
         // check error code names
         if ($diff = array_diff(array_keys($messages), array_keys($this->messages))) {
-            throw new InvalidArgumentException(sprintf('%s does not support the following error codes: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+            throw new \InvalidArgumentException(sprintf('%s does not support the following error codes: \'%s\'.', get_class($this), implode('\', \'', $diff)));
         }
 
         // check required options
         if ($diff = array_diff($this->requiredOptions, array_merge($currentOptionKeys, $optionKeys))) {
-            throw new RuntimeException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+            throw new \RuntimeException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
         }
 
         $this->options = array_merge($this->options, $options);
@@ -95,7 +96,7 @@ public function getMessage($name)
      * @param string $name  The error code
      * @param string $value The error message
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function addMessage($name, $value)
     {
@@ -110,12 +111,12 @@ public function addMessage($name, $value)
      * @param string $name  The error code
      * @param string $value The error message
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function setMessage($name, $value)
     {
         if (!array_key_exists($name, $this->messages)) {
-            throw new InvalidArgumentException(sprintf('%s does not support the following error code: \'%s\'.', get_class($this), $name));
+            throw new \InvalidArgumentException(sprintf('%s does not support the following error code: \'%s\'.', get_class($this), $name));
         }
 
         $this->messages[$name] = $value;
@@ -138,11 +139,11 @@ public function getMessages()
      *
      * @param array $values An array of error messages
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function setMessages($values)
     {
-        $this->messages = array_merge(array('required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']), $values);
+        $this->messages = array_merge(['required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']], $values);
 
         return $this;
     }
@@ -165,7 +166,7 @@ public function getOption($name)
      * @param string $name  The option name
      * @param mixed  $value The default value
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function addOption($name, $value = null)
     {
@@ -180,12 +181,12 @@ public function addOption($name, $value = null)
      * @param string $name  The option name
      * @param mixed  $value The value
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function setOption($name, $value)
     {
         if (!in_array($name, array_merge(array_keys($this->options), $this->requiredOptions))) {
-            throw new InvalidArgumentException(sprintf('%s does not support the following option: \'%s\'.', get_class($this), $name));
+            throw new \InvalidArgumentException(sprintf('%s does not support the following option: \'%s\'.', get_class($this), $name));
         }
 
         $this->options[$name] = $value;
@@ -220,11 +221,11 @@ public function getOptions()
      *
      * @param array $values An array of options
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function setOptions($values)
     {
-        $this->options = array_merge(array('required' => true, 'trim' => false, 'empty_value' => null), $values);
+        $this->options = array_merge(['required' => true, 'trim' => false, 'empty_value' => null], $values);
 
         return $this;
     }
@@ -234,7 +235,7 @@ public function setOptions($values)
      *
      * @param string $name The option name
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
     public function addRequiredOption($name)
     {
@@ -274,7 +275,7 @@ public static function setDefaultMessage($name, $message)
      *
      * @return mixed The cleaned value
      *
-     * @throws sfValidatorError
+     * @throws \sfValidatorError
      */
     public function clean($value)
     {
@@ -288,7 +289,7 @@ public function clean($value)
         if ($this->isEmpty($clean)) {
             // required?
             if ($this->options['required']) {
-                throw new sfValidatorError($this, 'required');
+                throw new \sfValidatorError($this, 'required');
             }
 
             return $this->getEmptyValue();
@@ -365,8 +366,8 @@ public function asString($indent = 0)
             '%s%s(%s%s)',
             str_repeat(' ', $indent),
             str_replace('sfValidator', '', get_class($this)),
-            $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-            $messages ? ', '.sfYamlInline::dump($messages) : ''
+            $options ? \sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+            $messages ? ', '.\sfYamlInline::dump($messages) : ''
         );
     }
 
@@ -385,7 +386,7 @@ public function asString($indent = 0)
      *
      * @see __construct()
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
     }
 
@@ -398,7 +399,7 @@ protected function configure($options = array(), $messages = array())
      *
      * @return mixed The cleaned value
      *
-     * @throws sfValidatorError
+     * @throws \sfValidatorError
      */
     abstract protected function doClean($value);
 
@@ -411,7 +412,7 @@ abstract protected function doClean($value);
      */
     protected function isEmpty($value)
     {
-        return in_array($value, array(null, '', array()), true);
+        return in_array($value, [null, '', []], true);
     }
 
     /**
diff --git a/lib/validator/sfValidatorBoolean.class.php b/lib/validator/sfValidatorBoolean.class.php
index 6319b7b59..53cdea860 100755
--- a/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/validator/sfValidatorBoolean.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorBoolean extends sfValidatorBase
+class sfValidatorBoolean extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -28,19 +29,19 @@ class sfValidatorBoolean extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
-        $this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1'));
-        $this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0'));
+        $this->addOption('true_values', ['true', 't', 'yes', 'y', 'on', '1']);
+        $this->addOption('false_values', ['false', 'f', 'no', 'n', 'off', '0']);
 
         $this->setOption('required', false);
         $this->setOption('empty_value', false);
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
@@ -53,6 +54,6 @@ protected function doClean($value)
             return false;
         }
 
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
+        throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
     }
 }
diff --git a/lib/validator/sfValidatorCSRFToken.class.php b/lib/validator/sfValidatorCSRFToken.class.php
index 2fcf5b2d1..851b1ae4c 100644
--- a/lib/validator/sfValidatorCSRFToken.class.php
+++ b/lib/validator/sfValidatorCSRFToken.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,12 +16,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorCSRFToken extends sfValidatorBase
+class sfValidatorCSRFToken extends \sfValidatorBase
 {
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('token');
 
@@ -30,12 +31,12 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         if ($value != $this->getOption('token')) {
-            throw new sfValidatorError($this, 'csrf_attack');
+            throw new \sfValidatorError($this, 'csrf_attack');
         }
 
         return $value;
diff --git a/lib/validator/sfValidatorCallback.class.php b/lib/validator/sfValidatorCallback.class.php
index 57a0fa5c8..48834f8d4 100644
--- a/lib/validator/sfValidatorCallback.class.php
+++ b/lib/validator/sfValidatorCallback.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorCallback extends sfValidatorBase
+class sfValidatorCallback extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -28,18 +29,18 @@ class sfValidatorCallback extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('callback');
-        $this->addOption('arguments', array());
+        $this->addOption('arguments', []);
 
         $this->setOption('required', false);
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorChoice.class.php b/lib/validator/sfValidatorChoice.class.php
index 6b9c64c97..b61582e84 100644
--- a/lib/validator/sfValidatorChoice.class.php
+++ b/lib/validator/sfValidatorChoice.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorChoice extends sfValidatorBase
+class sfValidatorChoice extends \sfValidatorBase
 {
     /**
      * Get choices.
@@ -25,7 +26,7 @@ class sfValidatorChoice extends sfValidatorBase
     public function getChoices()
     {
         $choices = $this->getOption('choices');
-        if ($choices instanceof sfCallable) {
+        if ($choices instanceof \sfCallable) {
             $choices = $choices->call();
         }
 
@@ -45,9 +46,9 @@ public function getChoices()
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('choices');
         $this->addOption('multiple', false);
@@ -59,7 +60,7 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
@@ -69,7 +70,7 @@ protected function doClean($value)
             $value = $this->cleanMultiple($value, $choices);
         } else {
             if (!self::inChoices($value, $choices)) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         }
 
@@ -86,23 +87,23 @@ protected function doClean($value)
     protected function cleanMultiple($value, $choices)
     {
         if (!is_array($value)) {
-            $value = array($value);
+            $value = [$value];
         }
 
         foreach ($value as $v) {
             if (!self::inChoices($v, $choices)) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $v));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $v]);
             }
         }
 
         $count = count($value);
 
         if ($this->hasOption('min') && $count < $this->getOption('min')) {
-            throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
+            throw new \sfValidatorError($this, 'min', ['count' => $count, 'min' => $this->getOption('min')]);
         }
 
         if ($this->hasOption('max') && $count > $this->getOption('max')) {
-            throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
+            throw new \sfValidatorError($this, 'max', ['count' => $count, 'max' => $this->getOption('max')]);
         }
 
         return $value;
@@ -145,7 +146,7 @@ protected function isEmpty($value)
      *
      * @return bool
      */
-    protected static function inChoices($value, array $choices = array())
+    protected static function inChoices($value, array $choices = [])
     {
         foreach ($choices as $choice) {
             if ((string) $choice == (string) $value) {
diff --git a/lib/validator/sfValidatorDate.class.php b/lib/validator/sfValidatorDate.class.php
index a4366932a..88f31e3e2 100644
--- a/lib/validator/sfValidatorDate.class.php
+++ b/lib/validator/sfValidatorDate.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorDate extends sfValidatorBase
+class sfValidatorDate extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -42,9 +43,9 @@ class sfValidatorDate extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addMessage('bad_format', '"%value%" does not match the date format (%date_format%).');
         $this->addMessage('max', 'The date must be before %max%.');
@@ -61,14 +62,14 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         // check date format
         if (is_string($value) && $regex = $this->getOption('date_format')) {
             if (!preg_match($regex, $value, $match)) {
-                throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ?: $this->getOption('date_format')));
+                throw new \sfValidatorError($this, 'bad_format', ['value' => $value, 'date_format' => $this->getOption('date_format_error') ?: $this->getOption('date_format')]);
             }
 
             $value = $match;
@@ -87,11 +88,11 @@ protected function doClean($value)
         // convert string to date number format
         else {
             try {
-                $date = new DateTime($value);
-                $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
+                $date = new \DateTime($value);
+                $date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
                 $clean = $date->format('YmdHis');
-            } catch (Exception $e) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            } catch (\Exception $e) {
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         }
 
@@ -104,13 +105,13 @@ protected function doClean($value)
             }
             // convert string to date number
             else {
-                $dateMax = new DateTime($max);
+                $dateMax = new \DateTime($max);
                 $max = $dateMax->format('YmdHis');
                 $maxError = $dateMax->format($this->getOption('date_format_range_error'));
             }
 
             if ($clean > $max) {
-                throw new sfValidatorError($this, 'max', array('value' => $value, 'max' => $maxError));
+                throw new \sfValidatorError($this, 'max', ['value' => $value, 'max' => $maxError]);
             }
         }
 
@@ -123,13 +124,13 @@ protected function doClean($value)
             }
             // convert string to date number
             else {
-                $dateMin = new DateTime($min);
+                $dateMin = new \DateTime($min);
                 $min = $dateMin->format('YmdHis');
                 $minError = $dateMin->format($this->getOption('date_format_range_error'));
             }
 
             if ($clean < $min) {
-                throw new sfValidatorError($this, 'min', array('value' => $value, 'min' => $minError));
+                throw new \sfValidatorError($this, 'min', ['value' => $value, 'min' => $minError]);
             }
         }
 
@@ -154,9 +155,9 @@ protected function doClean($value)
     protected function convertDateArrayToString($value)
     {
         // all elements must be empty or a number
-        foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $key) {
+        foreach (['year', 'month', 'day', 'hour', 'minute', 'second'] as $key) {
             if (isset($value[$key]) && !ctype_digit((string) $value[$key]) && !empty($value[$key])) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         }
 
@@ -166,14 +167,14 @@ protected function convertDateArrayToString($value)
           (!isset($value['month']) || !$value['month'] ? 1 : 0) +
           (!isset($value['day']) || !$value['day'] ? 1 : 0);
         if ($empties > 0 && $empties < 3) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
         if (3 == $empties) {
             return $this->getEmptyValue();
         }
 
         if (!checkdate((int) $value['month'], (int) $value['day'], (int) $value['year'])) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         if ($this->getOption('with_time')) {
@@ -183,7 +184,7 @@ protected function convertDateArrayToString($value)
                 $this->isValueSet($value, 'second') && (!$this->isValueSet($value, 'minute') || !$this->isValueSet($value, 'hour'))
                 || $this->isValueSet($value, 'minute') && !$this->isValueSet($value, 'hour')
             ) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
 
             $clean = sprintf(
@@ -212,11 +213,11 @@ protected function convertDateArrayToString($value)
 
     protected function isValueSet($values, $key)
     {
-        return isset($values[$key]) && !in_array($values[$key], array(null, ''), true);
+        return isset($values[$key]) && !in_array($values[$key], [null, ''], true);
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function isEmpty($value)
     {
diff --git a/lib/validator/sfValidatorDateRange.class.php b/lib/validator/sfValidatorDateRange.class.php
index 48cd2f5d1..19d9db50a 100644
--- a/lib/validator/sfValidatorDateRange.class.php
+++ b/lib/validator/sfValidatorDateRange.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorDateRange extends sfValidatorBase
+class sfValidatorDateRange extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -30,9 +31,9 @@ class sfValidatorDateRange extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->setMessage('invalid', 'The begin date must be before the end date.');
 
@@ -43,7 +44,7 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
@@ -54,7 +55,7 @@ protected function doClean($value)
         $value[$toField] = $this->getOption('to_date')->clean(isset($value[$toField]) ? $value[$toField] : null);
 
         if ($value[$fromField] && $value[$toField]) {
-            $v = new sfValidatorSchemaCompare($fromField, sfValidatorSchemaCompare::LESS_THAN_EQUAL, $toField, array('throw_global_error' => true), array('invalid' => $this->getMessage('invalid')));
+            $v = new \sfValidatorSchemaCompare($fromField, \sfValidatorSchemaCompare::LESS_THAN_EQUAL, $toField, ['throw_global_error' => true], ['invalid' => $this->getMessage('invalid')]);
             $v->clean($value);
         }
 
diff --git a/lib/validator/sfValidatorDateTime.class.php b/lib/validator/sfValidatorDateTime.class.php
index ebd7aa783..5a183c6f0 100644
--- a/lib/validator/sfValidatorDateTime.class.php
+++ b/lib/validator/sfValidatorDateTime.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,12 +16,12 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorDateTime extends sfValidatorDate
+class sfValidatorDateTime extends \sfValidatorDate
 {
     /**
-     * @see sfValidatorDate
+     * @see \sfValidatorDate
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
diff --git a/lib/validator/sfValidatorDecorator.class.php b/lib/validator/sfValidatorDecorator.class.php
index c197eb4a1..ce88b8d0c 100644
--- a/lib/validator/sfValidatorDecorator.class.php
+++ b/lib/validator/sfValidatorDecorator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,19 +20,19 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfValidatorDecorator extends sfValidatorBase
+abstract class sfValidatorDecorator extends \sfValidatorBase
 {
     protected $validator;
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($options = array(), $messages = array())
+    public function __construct($options = [], $messages = [])
     {
         $this->validator = $this->getValidator();
 
-        if (!$this->validator instanceof sfValidatorBase) {
-            throw new RuntimeException('The getValidator() method must return a sfValidatorBase instance.');
+        if (!$this->validator instanceof \sfValidatorBase) {
+            throw new \RuntimeException('The getValidator() method must return a sfValidatorBase instance.');
         }
 
         foreach ($options as $key => $value) {
@@ -44,7 +45,7 @@ public function __construct($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function clean($value)
     {
@@ -52,7 +53,7 @@ public function clean($value)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function getMessage($name)
     {
@@ -60,7 +61,7 @@ public function getMessage($name)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function setMessage($name, $value)
     {
@@ -68,7 +69,7 @@ public function setMessage($name, $value)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function getMessages()
     {
@@ -76,7 +77,7 @@ public function getMessages()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function setMessages($values)
     {
@@ -84,7 +85,7 @@ public function setMessages($values)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function getOption($name)
     {
@@ -92,7 +93,7 @@ public function getOption($name)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function setOption($name, $value)
     {
@@ -100,7 +101,7 @@ public function setOption($name, $value)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function hasOption($name)
     {
@@ -108,7 +109,7 @@ public function hasOption($name)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function getOptions()
     {
@@ -116,7 +117,7 @@ public function getOptions()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function setOptions($values)
     {
@@ -124,7 +125,7 @@ public function setOptions($values)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function asString($indent = 0)
     {
@@ -132,7 +133,7 @@ public function asString($indent = 0)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function getDefaultOptions()
     {
@@ -140,7 +141,7 @@ public function getDefaultOptions()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function getDefaultMessages()
     {
@@ -152,12 +153,12 @@ public function getDefaultMessages()
      *
      * Every subclass must implement this method.
      *
-     * @return sfValidatorBase A sfValidatorBase instance
+     * @return \sfValidatorBase A sfValidatorBase instance
      */
     abstract protected function getValidator();
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorEmail.class.php b/lib/validator/sfValidatorEmail.class.php
index 39b218164..0d153aab4 100644
--- a/lib/validator/sfValidatorEmail.class.php
+++ b/lib/validator/sfValidatorEmail.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,14 +16,14 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorEmail extends sfValidatorRegex
+class sfValidatorEmail extends \sfValidatorRegex
 {
     public const REGEX_EMAIL = '/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i';
 
     /**
-     * @see sfValidatorRegex
+     * @see \sfValidatorRegex
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
diff --git a/lib/validator/sfValidatorEqual.class.php b/lib/validator/sfValidatorEqual.class.php
index bc5b16cda..98c2dcf10 100644
--- a/lib/validator/sfValidatorEqual.class.php
+++ b/lib/validator/sfValidatorEqual.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorEqual extends sfValidatorBase
+class sfValidatorEqual extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -33,9 +34,9 @@ class sfValidatorEqual extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('value');
         $this->addOption('strict', false);
@@ -45,14 +46,14 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         $isStrict = $this->getOption('strict');
 
         if (($isStrict && $value !== $this->getOption('value')) || (!$isStrict && $value != $this->getOption('value'))) {
-            throw new sfValidatorError($this, $isStrict ? 'not_strictly_equal' : 'not_equal', array('value' => $value, 'compared_value' => $this->getOption('value')));
+            throw new \sfValidatorError($this, $isStrict ? 'not_strictly_equal' : 'not_equal', ['value' => $value, 'compared_value' => $this->getOption('value')]);
         }
 
         return $value;
diff --git a/lib/validator/sfValidatorError.class.php b/lib/validator/sfValidatorError.class.php
index f94ff6bc0..3b739f609 100644
--- a/lib/validator/sfValidatorError.class.php
+++ b/lib/validator/sfValidatorError.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,19 +16,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorError extends Exception implements Serializable
+class sfValidatorError extends \Exception implements \Serializable
 {
     protected $validator;
-    protected $arguments = array();
+    protected $arguments = [];
 
     /**
      * Constructor.
      *
-     * @param sfValidatorBase $validator An sfValidatorBase instance
-     * @param string          $code      The error code
-     * @param array           $arguments An array of named arguments needed to render the error message
+     * @param \sfValidatorBase $validator An sfValidatorBase instance
+     * @param string           $code      The error code
+     * @param array            $arguments An array of named arguments needed to render the error message
      */
-    public function __construct(sfValidatorBase $validator, $code, $arguments = array())
+    public function __construct(\sfValidatorBase $validator, $code, $arguments = [])
     {
         $this->validator = $validator;
         $this->arguments = $arguments;
@@ -58,7 +59,7 @@ public function __toString()
      */
     public function __serialize()
     {
-        return array($this->validator, $this->arguments, $this->code, $this->message);
+        return [$this->validator, $this->arguments, $this->code, $this->message];
     }
 
     /**
@@ -82,7 +83,7 @@ public function getValue()
     /**
      * Returns the validator that triggered this error.
      *
-     * @return sfValidatorBase A sfValidatorBase instance
+     * @return \sfValidatorBase A sfValidatorBase instance
      */
     public function getValidator()
     {
@@ -102,13 +103,13 @@ public function getArguments($raw = false)
             return $this->arguments;
         }
 
-        $arguments = array();
+        $arguments = [];
         foreach ($this->arguments as $key => $value) {
             if (is_array($value)) {
                 continue;
             }
 
-            $arguments["%{$key}%"] = htmlspecialchars($value, ENT_QUOTES, sfValidatorBase::getCharset());
+            $arguments["%{$key}%"] = htmlspecialchars($value, ENT_QUOTES, \sfValidatorBase::getCharset());
         }
 
         return $arguments;
diff --git a/lib/validator/sfValidatorErrorSchema.class.php b/lib/validator/sfValidatorErrorSchema.class.php
index 38fe04149..46f99c5f3 100644
--- a/lib/validator/sfValidatorErrorSchema.class.php
+++ b/lib/validator/sfValidatorErrorSchema.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,23 +16,23 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorErrorSchema extends sfValidatorError implements ArrayAccess, Iterator, Countable
+class sfValidatorErrorSchema extends \sfValidatorError implements \ArrayAccess, \Iterator, \Countable
 {
-    protected $errors = array();
-    protected $globalErrors = array();
-    protected $namedErrors = array();
+    protected $errors = [];
+    protected $globalErrors = [];
+    protected $namedErrors = [];
     protected $count = 0;
 
     /**
      * Constructor.
      *
-     * @param sfValidatorBase $validator An sfValidatorBase instance
-     * @param array           $errors    An array of errors, depreciated
+     * @param \sfValidatorBase $validator An sfValidatorBase instance
+     * @param array            $errors    An array of errors, depreciated
      */
-    public function __construct(sfValidatorBase $validator, $errors = array())
+    public function __construct(\sfValidatorBase $validator, $errors = [])
     {
         $this->validator = $validator;
-        $this->arguments = array();
+        $this->arguments = [];
 
         // override default exception message and code
         $this->code = '';
@@ -47,28 +48,28 @@ public function __construct(sfValidatorBase $validator, $errors = array())
      *
      * This method merges sfValidatorErrorSchema errors with the current instance.
      *
-     * @param sfValidatorError $error An sfValidatorError instance
-     * @param string           $name  The error name
+     * @param \sfValidatorError $error An sfValidatorError instance
+     * @param string            $name  The error name
      *
-     * @return sfValidatorErrorSchema The current error schema instance
+     * @return \sfValidatorErrorSchema The current error schema instance
      */
-    public function addError(sfValidatorError $error, $name = null)
+    public function addError(\sfValidatorError $error, $name = null)
     {
         if (null === $name) {
-            if ($error instanceof sfValidatorErrorSchema) {
+            if ($error instanceof \sfValidatorErrorSchema) {
                 $this->addErrors($error);
             } else {
                 $this->globalErrors[] = $error;
                 $this->errors[] = $error;
             }
         } elseif (isset($this->namedErrors[$name])) {
-            if (!$this->namedErrors[$name] instanceof sfValidatorErrorSchema) {
+            if (!$this->namedErrors[$name] instanceof \sfValidatorErrorSchema) {
                 $current = $this->namedErrors[$name];
-                $this->namedErrors[$name] = new sfValidatorErrorSchema($current->getValidator());
+                $this->namedErrors[$name] = new \sfValidatorErrorSchema($current->getValidator());
                 $this->namedErrors[$name]->addError($current);
             }
 
-            $method = $error instanceof sfValidatorErrorSchema ? 'addErrors' : 'addError';
+            $method = $error instanceof \sfValidatorErrorSchema ? 'addErrors' : 'addError';
             $this->namedErrors[$name]->{$method}($error);
 
             $this->errors[$name] = $this->namedErrors[$name];
@@ -86,9 +87,9 @@ public function addError(sfValidatorError $error, $name = null)
     /**
      * Adds a collection of errors.
      *
-     * @return sfValidatorErrorSchema The current error schema instance
+     * @return \sfValidatorErrorSchema The current error schema instance
      */
-    public function addErrors(sfValidatorErrorSchema $errors)
+    public function addErrors(\sfValidatorErrorSchema $errors)
     {
         foreach ($errors->getGlobalErrors() as $error) {
             $this->addError($error);
@@ -132,7 +133,7 @@ public function getGlobalErrors()
     }
 
     /**
-     * @see sfValidatorError
+     * @see \sfValidatorError
      */
     public function getValue()
     {
@@ -140,15 +141,15 @@ public function getValue()
     }
 
     /**
-     * @see sfValidatorError
+     * @see \sfValidatorError
      */
     public function getArguments($raw = false)
     {
-        return array();
+        return [];
     }
 
     /**
-     * @see sfValidatorError
+     * @see \sfValidatorError
      */
     public function getMessageFormat()
     {
@@ -239,7 +240,7 @@ public function offsetExists($name)
      *
      * @param string $name The offset of the value to get
      *
-     * @return sfValidatorError A sfValidatorError instance
+     * @return \sfValidatorError A sfValidatorError instance
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($name)
@@ -253,12 +254,12 @@ public function offsetGet($name)
      * @param string $offset (ignored)
      * @param string $value  (ignored)
      *
-     * @throws LogicException
+     * @throws \LogicException
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        throw new LogicException('Unable update an error.');
+        throw new \LogicException('Unable update an error.');
     }
 
     /**
@@ -278,7 +279,7 @@ public function offsetUnset($offset)
      */
     public function serialize()
     {
-        return serialize(array($this->validator, $this->arguments, $this->code, $this->message, $this->errors, $this->globalErrors, $this->namedErrors));
+        return serialize([$this->validator, $this->arguments, $this->code, $this->message, $this->errors, $this->globalErrors, $this->namedErrors]);
     }
 
     /**
diff --git a/lib/validator/sfValidatorFile.class.php b/lib/validator/sfValidatorFile.class.php
index 368bea6f1..bc396d9de 100644
--- a/lib/validator/sfValidatorFile.class.php
+++ b/lib/validator/sfValidatorFile.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorFile extends sfValidatorBase
+class sfValidatorFile extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -47,29 +48,29 @@ class sfValidatorFile extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         if (!ini_get('file_uploads')) {
-            throw new LogicException(sprintf('Unable to use a file validator as "file_uploads" is disabled in your php.ini file (%s)', get_cfg_var('cfg_file_path')));
+            throw new \LogicException(sprintf('Unable to use a file validator as "file_uploads" is disabled in your php.ini file (%s)', get_cfg_var('cfg_file_path')));
         }
 
         $this->addOption('max_size');
         $this->addOption('mime_types');
-        $this->addOption('mime_type_guessers', array(
-            array($this, 'guessFromFileinfo'),
-            array($this, 'guessFromMimeContentType'),
-            array($this, 'guessFromFileBinary'),
-        ));
-        $this->addOption('mime_categories', array(
-            'web_images' => array(
+        $this->addOption('mime_type_guessers', [
+            [$this, 'guessFromFileinfo'],
+            [$this, 'guessFromMimeContentType'],
+            [$this, 'guessFromFileBinary'],
+        ]);
+        $this->addOption('mime_categories', [
+            'web_images' => [
                 'image/jpeg',
                 'image/pjpeg',
                 'image/png',
                 'image/x-png',
                 'image/gif',
-            )));
+            ]]);
         $this->addOption('validated_file_class', 'sfValidatedFile');
         $this->addOption('path', null);
 
@@ -92,12 +93,12 @@ protected function configure($options = array(), $messages = array())
      *  * error:    The error code (optional)
      *  * size:     The file size in bytes (optional)
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         if (!is_array($value) || !isset($value['tmp_name'])) {
-            throw new sfValidatorError($this, 'invalid', array('value' => (string) $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => (string) $value]);
         }
 
         if (!isset($value['name'])) {
@@ -123,22 +124,22 @@ protected function doClean($value)
                     $max = min($max, $this->getOption('max_size'));
                 }
 
-                throw new sfValidatorError($this, 'max_size', array('max_size' => round($max / 1024, 0), 'size' => (int) $value['size']));
+                throw new \sfValidatorError($this, 'max_size', ['max_size' => round($max / 1024, 0), 'size' => (int) $value['size']]);
             case UPLOAD_ERR_FORM_SIZE:
-                throw new sfValidatorError($this, 'max_size', array('max_size' => 0, 'size' => (int) $value['size']));
+                throw new \sfValidatorError($this, 'max_size', ['max_size' => 0, 'size' => (int) $value['size']]);
             case UPLOAD_ERR_PARTIAL:
-                throw new sfValidatorError($this, 'partial');
+                throw new \sfValidatorError($this, 'partial');
             case UPLOAD_ERR_NO_TMP_DIR:
-                throw new sfValidatorError($this, 'no_tmp_dir');
+                throw new \sfValidatorError($this, 'no_tmp_dir');
             case UPLOAD_ERR_CANT_WRITE:
-                throw new sfValidatorError($this, 'cant_write');
+                throw new \sfValidatorError($this, 'cant_write');
             case UPLOAD_ERR_EXTENSION:
-                throw new sfValidatorError($this, 'extension');
+                throw new \sfValidatorError($this, 'extension');
         }
 
         // check file size
         if ($this->hasOption('max_size') && $this->getOption('max_size') < (int) $value['size']) {
-            throw new sfValidatorError($this, 'max_size', array('max_size' => round($this->getOption('max_size') / 1024, 0), 'size' => (int) $value['size']));
+            throw new \sfValidatorError($this, 'max_size', ['max_size' => round($this->getOption('max_size') / 1024, 0), 'size' => (int) $value['size']]);
         }
 
         $mimeType = $this->getMimeType((string) $value['tmp_name'], (string) $value['type']);
@@ -147,7 +148,7 @@ protected function doClean($value)
         if ($this->hasOption('mime_types')) {
             $mimeTypes = is_array($this->getOption('mime_types')) ? $this->getOption('mime_types') : $this->getMimeTypesFromCategory($this->getOption('mime_types'));
             if (!in_array($mimeType, array_map('strtolower', $mimeTypes))) {
-                throw new sfValidatorError($this, 'mime_types', array('mime_types' => $mimeTypes, 'mime_type' => $mimeType));
+                throw new \sfValidatorError($this, 'mime_types', ['mime_types' => $mimeTypes, 'mime_type' => $mimeType]);
             }
         }
 
@@ -196,7 +197,7 @@ protected function guessFromFileinfo($file)
             return null;
         }
 
-        if (!$finfo = new finfo(FILEINFO_MIME)) {
+        if (!$finfo = new \finfo(FILEINFO_MIME)) {
             return null;
         }
 
@@ -238,7 +239,7 @@ protected function guessFromFileBinary($file)
         ob_start();
         // need to use --mime instead of -i. see #6641
         $cmd = 'file -b --mime -- %s 2>/dev/null';
-        $file = (0 === strpos($file, '-') ? './' : '').$file;
+        $file = (str_starts_with($file, '-') ? './' : '').$file;
         passthru(sprintf($cmd, escapeshellarg($file)), $return);
         if ($return > 0) {
             ob_end_clean();
@@ -260,14 +261,14 @@ protected function getMimeTypesFromCategory($category)
         $categories = $this->getOption('mime_categories');
 
         if (!isset($categories[$category])) {
-            throw new InvalidArgumentException(sprintf('Invalid mime type category "%s".', $category));
+            throw new \InvalidArgumentException(sprintf('Invalid mime type category "%s".', $category));
         }
 
         return $categories[$category];
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function isEmpty($value)
     {
@@ -281,7 +282,7 @@ protected function isEmpty($value)
     /**
      * Returns the maximum size of an uploaded file as configured in php.ini.
      *
-     * @return type The maximum size of an uploaded file in bytes
+     * @return \type The maximum size of an uploaded file in bytes
      */
     protected function getMaxFilesize()
     {
diff --git a/lib/validator/sfValidatorFileMulti.class.php b/lib/validator/sfValidatorFileMulti.class.php
index df726d1c3..c9169db89 100644
--- a/lib/validator/sfValidatorFileMulti.class.php
+++ b/lib/validator/sfValidatorFileMulti.class.php
@@ -1,13 +1,22 @@
 <?php
 
-class sfValidatorFileMulti extends sfValidatorFile
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class sfValidatorFileMulti extends \sfValidatorFile
 {
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
-        $clean = array();
+        $clean = [];
 
         foreach ($value as $file) {
             $clean[] = parent::doClean($file);
diff --git a/lib/validator/sfValidatorFromDescription.class.php b/lib/validator/sfValidatorFromDescription.class.php
index 11bcd93fc..c0a9572a6 100644
--- a/lib/validator/sfValidatorFromDescription.class.php
+++ b/lib/validator/sfValidatorFromDescription.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,15 +16,15 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorFromDescription extends sfValidatorDecorator
+class sfValidatorFromDescription extends \sfValidatorDecorator
 {
-    protected $tokens = array();
+    protected $tokens = [];
     protected $string = '';
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($string, $options = array(), $messages = array())
+    public function __construct($string, $options = [], $messages = [])
     {
         $this->string = $string;
         $this->tokens = $this->tokenize($string);
@@ -46,7 +47,7 @@ public function asPhp()
     }
 
     /**
-     * @see sfValidatorDecorator
+     * @see \sfValidatorDecorator
      */
     public function getValidator()
     {
@@ -66,7 +67,7 @@ public function getValidator()
      */
     protected function tokenize($string)
     {
-        $tokens = array();
+        $tokens = [];
         $len = strlen($string);
         $i = 0;
         while ($i < $len) {
@@ -82,13 +83,13 @@ protected function tokenize($string)
 
                 // rightField
                 if (!preg_match('/\s*([a-z0-9_\-]+)/', substr($string, $i), $match)) {
-                    throw new DomainException('Parsing problem.');
+                    throw new \DomainException('Parsing problem.');
                 }
 
                 $i += strlen($match[0]);
                 $rightField = $match[1];
 
-                $tokens[] = new sfValidatorFDToken('sfValidatorSchemaCompare', array($leftField, $operator, $rightField, $arguments[0], isset($arguments[1]) ? $arguments[1] : array()));
+                $tokens[] = new \sfValidatorFDToken('sfValidatorSchemaCompare', [$leftField, $operator, $rightField, $arguments[0], isset($arguments[1]) ? $arguments[1] : []]);
             } elseif (preg_match('/^(and|or)/i', substr($string, $i), $match)) {
                 // all, any validador
                 $i += strlen($match[0]);
@@ -96,29 +97,29 @@ protected function tokenize($string)
                 // arguments (optional)
                 $arguments = $this->parseArguments($string, $i);
 
-                $tokens[] = new sfValidatorFDTokenOperator(strtolower($match[1]), $arguments);
+                $tokens[] = new \sfValidatorFDTokenOperator(strtolower($match[1]), $arguments);
             } elseif (preg_match('/^(?:([a-z0-9_\-]+)\:)?([a-z0-9_\-]+)/i', substr($string, $i), $match)) {
                 // single validator (optionally filtered)
                 $i += strlen($match[0]);
 
                 $class = 'sfValidator'.$match[2];
                 $arguments = $this->parseArguments($string, $i);
-                $token = new sfValidatorFDToken($class, array($arguments[0], isset($arguments[1]) ? $arguments[1] : array()));
+                $token = new \sfValidatorFDToken($class, [$arguments[0], isset($arguments[1]) ? $arguments[1] : []]);
                 if ($match[1]) {
-                    $token = new sfValidatorFDTokenFilter($match[1], $token);
+                    $token = new \sfValidatorFDTokenFilter($match[1], $token);
                 }
 
                 $tokens[] = $token;
             } elseif ('(' == $string[$i]) {
-                $tokens[] = new sfValidatorFDTokenLeftBracket();
+                $tokens[] = new \sfValidatorFDTokenLeftBracket();
                 ++$i;
             } elseif (')' == $string[$i]) {
-                $tokens[] = new sfValidatorFDTokenRightBracket();
+                $tokens[] = new \sfValidatorFDTokenRightBracket();
                 ++$i;
-            } elseif (in_array($string[$i], array(' ', "\t", "\r", "\n"))) {
+            } elseif (in_array($string[$i], [' ', "\t", "\r", "\n"])) {
                 ++$i;
             } else {
-                throw new DomainException(sprintf('Unable to parse string (%s).', $string));
+                throw new \DomainException(sprintf('Unable to parse string (%s).', $string));
             }
         }
 
@@ -138,7 +139,7 @@ protected function parseArguments($string, &$i)
         $len = strlen($string);
 
         if ($i + 1 > $len || '(' != $string[$i]) {
-            return array(array(), array());
+            return [[], []];
         }
 
         ++$i;
@@ -161,7 +162,7 @@ protected function parseArguments($string, &$i)
 
         ++$i;
 
-        return sfYamlInline::load('['.(!$args ? '{}' : $args).']');
+        return \sfYamlInline::load('['.(!$args ? '{}' : $args).']');
     }
 
     /**
@@ -173,9 +174,9 @@ protected function parseArguments($string, &$i)
      */
     protected function convertInfixToRpn($tokens)
     {
-        $outputStack = array();
-        $operatorStack = array();
-        $precedences = array('and' => 2, 'or' => 1, '(' => 0);
+        $outputStack = [];
+        $operatorStack = [];
+        $precedences = ['and' => 2, 'or' => 1, '(' => 0];
 
         // based on the shunting yard algorithm
         foreach ($tokens as $token) {
@@ -191,7 +192,7 @@ protected function convertInfixToRpn($tokens)
                     break;
 
                 case 'sfValidatorFDTokenRightBracket':
-                    while (!$operatorStack[count($operatorStack) - 1] instanceof sfValidatorFDTokenLeftBracket) {
+                    while (!$operatorStack[count($operatorStack) - 1] instanceof \sfValidatorFDTokenLeftBracket) {
                         $outputStack[] = array_pop($operatorStack);
                     }
                     array_pop($operatorStack);
@@ -213,8 +214,8 @@ protected function convertInfixToRpn($tokens)
 
         while (count($operatorStack)) {
             $token = array_pop($operatorStack);
-            if ($token instanceof sfValidatorFDTokenLeftBracket || $token instanceof sfValidatorFDTokenRightBracket) {
-                throw new DomainException(sprintf('Uneven parenthesis in string (%s).', $this->string));
+            if ($token instanceof \sfValidatorFDTokenLeftBracket || $token instanceof \sfValidatorFDTokenRightBracket) {
+                throw new \DomainException(sprintf('Uneven parenthesis in string (%s).', $this->string));
             }
 
             $outputStack[] = $token;
@@ -240,7 +241,7 @@ protected function reduceTokens($tokens, $method)
         // reduce to a single validator
         while (count($tokens) > 1) {
             $i = 0;
-            while (isset($tokens[$i]) && !$tokens[$i] instanceof sfValidatorFDTokenOperator) {
+            while (isset($tokens[$i]) && !$tokens[$i] instanceof \sfValidatorFDTokenOperator) {
                 ++$i;
             }
 
@@ -259,7 +260,7 @@ class sfValidatorFDToken
     protected $class;
     protected $arguments;
 
-    public function __construct($class, $arguments = array())
+    public function __construct($class, $arguments = [])
     {
         $this->class = $class;
         $this->arguments = $arguments;
@@ -272,7 +273,7 @@ public function asPhp()
 
     public function getValidator()
     {
-        $reflection = new ReflectionClass($this->class);
+        $reflection = new \ReflectionClass($this->class);
 
         return $reflection->newInstanceArgs($this->arguments);
     }
@@ -283,7 +284,7 @@ class sfValidatorFDTokenFilter
     protected $field;
     protected $token;
 
-    public function __construct($field, sfValidatorFDToken $token)
+    public function __construct($field, \sfValidatorFDToken $token)
     {
         $this->field = $field;
         $this->token = $token;
@@ -296,7 +297,7 @@ public function asPhp()
 
     public function getValidator()
     {
-        return new sfValidatorSchemaFilter($this->field, $this->token->getValidator());
+        return new \sfValidatorSchemaFilter($this->field, $this->token->getValidator());
     }
 }
 
@@ -306,7 +307,7 @@ class sfValidatorFDTokenOperator
     protected $operator;
     protected $token;
 
-    public function __construct($operator, $arguments = array())
+    public function __construct($operator, $arguments = [])
     {
         $this->operator = $operator;
         $this->arguments = $arguments;
@@ -323,22 +324,22 @@ public function asPhp($tokenLeft, $tokenRight)
         return sprintf(
             'new %s(array(%s, %s), %s)',
             $this->class,
-            is_object($tokenLeft) && in_array(get_class($tokenLeft), array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenLeft->asPhp() : $tokenLeft,
-            is_object($tokenRight) && in_array(get_class($tokenRight), array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenRight->asPhp() : $tokenRight,
+            is_object($tokenLeft) && in_array(get_class($tokenLeft), ['sfValidatorFDToken', 'sfValidatorFDTokenFilter']) ? $tokenLeft->asPhp() : $tokenLeft,
+            is_object($tokenRight) && in_array(get_class($tokenRight), ['sfValidatorFDToken', 'sfValidatorFDTokenFilter']) ? $tokenRight->asPhp() : $tokenRight,
             implode(', ', array_map(function ($a) { return var_export($a, true); }, $this->arguments))
         );
     }
 
     public function getValidator($tokenLeft, $tokenRight)
     {
-        $reflection = new ReflectionClass($this->class);
+        $reflection = new \ReflectionClass($this->class);
 
-        $validators = array(
-            in_array(get_class($tokenLeft), array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenLeft->getValidator() : $tokenLeft,
-            in_array(get_class($tokenRight), array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenRight->getValidator() : $tokenRight,
-        );
+        $validators = [
+            in_array(get_class($tokenLeft), ['sfValidatorFDToken', 'sfValidatorFDTokenFilter']) ? $tokenLeft->getValidator() : $tokenLeft,
+            in_array(get_class($tokenRight), ['sfValidatorFDToken', 'sfValidatorFDTokenFilter']) ? $tokenRight->getValidator() : $tokenRight,
+        ];
 
-        return $reflection->newInstanceArgs(array_merge(array($validators), $this->arguments));
+        return $reflection->newInstanceArgs(array_merge([$validators], $this->arguments));
     }
 }
 
diff --git a/lib/validator/sfValidatorInteger.class.php b/lib/validator/sfValidatorInteger.class.php
index 48169a187..1581c39b8 100644
--- a/lib/validator/sfValidatorInteger.class.php
+++ b/lib/validator/sfValidatorInteger.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorInteger extends sfValidatorBase
+class sfValidatorInteger extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -33,9 +34,9 @@ class sfValidatorInteger extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addMessage('max', '"%value%" must be at most %max%.');
         $this->addMessage('min', '"%value%" must be at least %min%.');
@@ -47,22 +48,22 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         $clean = (int) $value;
 
         if ((string) $clean != $value) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         if ($this->hasOption('max') && $clean > $this->getOption('max')) {
-            throw new sfValidatorError($this, 'max', array('value' => $value, 'max' => $this->getOption('max')));
+            throw new \sfValidatorError($this, 'max', ['value' => $value, 'max' => $this->getOption('max')]);
         }
 
         if ($this->hasOption('min') && $clean < $this->getOption('min')) {
-            throw new sfValidatorError($this, 'min', array('value' => $value, 'min' => $this->getOption('min')));
+            throw new \sfValidatorError($this, 'min', ['value' => $value, 'min' => $this->getOption('min')]);
         }
 
         return $clean;
diff --git a/lib/validator/sfValidatorIp.class.php b/lib/validator/sfValidatorIp.class.php
index c65334083..517b78a3a 100644
--- a/lib/validator/sfValidatorIp.class.php
+++ b/lib/validator/sfValidatorIp.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorIp extends sfValidatorString
+class sfValidatorIp extends \sfValidatorString
 {
     public const IP_V4 = '4';
     public const IP_V6 = '6';
@@ -36,7 +37,7 @@ class sfValidatorIp extends sfValidatorString
     public const IP_V6_ONLY_PUBLIC = '6_public';
     public const IP_ALL_ONLY_PUBLIC = 'all_public';
 
-    public function configure($options = array(), $messages = array())
+    public function configure($options = [], $messages = [])
     {
         $this->addOption('version', self::IP_ALL);
 
@@ -112,7 +113,7 @@ protected function doClean($value)
         }
 
         if (!filter_var($value, FILTER_VALIDATE_IP, $flag)) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         return $value;
diff --git a/lib/validator/sfValidatorNumber.class.php b/lib/validator/sfValidatorNumber.class.php
index aa3656e15..994db9c3c 100644
--- a/lib/validator/sfValidatorNumber.class.php
+++ b/lib/validator/sfValidatorNumber.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorNumber extends sfValidatorBase
+class sfValidatorNumber extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -33,9 +34,9 @@ class sfValidatorNumber extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addMessage('max', '"%value%" must be at most %max%.');
         $this->addMessage('min', '"%value%" must be at least %min%.');
@@ -47,22 +48,22 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
         if (!is_numeric($value)) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         $clean = (float) $value;
 
         if ($this->hasOption('max') && $clean > $this->getOption('max')) {
-            throw new sfValidatorError($this, 'max', array('value' => $value, 'max' => $this->getOption('max')));
+            throw new \sfValidatorError($this, 'max', ['value' => $value, 'max' => $this->getOption('max')]);
         }
 
         if ($this->hasOption('min') && $clean < $this->getOption('min')) {
-            throw new sfValidatorError($this, 'min', array('value' => $value, 'min' => $this->getOption('min')));
+            throw new \sfValidatorError($this, 'min', ['value' => $value, 'min' => $this->getOption('min')]);
         }
 
         return $clean;
diff --git a/lib/validator/sfValidatorOr.class.php b/lib/validator/sfValidatorOr.class.php
index 910b14f05..5ba41df0b 100644
--- a/lib/validator/sfValidatorOr.class.php
+++ b/lib/validator/sfValidatorOr.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorOr extends sfValidatorBase
+class sfValidatorOr extends \sfValidatorBase
 {
-    protected $validators = array();
+    protected $validators = [];
 
     /**
      * Constructor.
@@ -32,18 +33,18 @@ class sfValidatorOr extends sfValidatorBase
      * @param array $options    An array of options
      * @param array $messages   An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($validators = null, $options = array(), $messages = array())
+    public function __construct($validators = null, $options = [], $messages = [])
     {
-        if ($validators instanceof sfValidatorBase) {
+        if ($validators instanceof \sfValidatorBase) {
             $this->addValidator($validators);
         } elseif (is_array($validators)) {
             foreach ($validators as $validator) {
                 $this->addValidator($validator);
             }
         } elseif (null !== $validators) {
-            throw new InvalidArgumentException('sfValidatorOr constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
+            throw new \InvalidArgumentException('sfValidatorOr constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
         }
 
         parent::__construct($options, $messages);
@@ -52,9 +53,9 @@ public function __construct($validators = null, $options = array(), $messages =
     /**
      * Adds a validator.
      *
-     * @param sfValidatorBase $validator An sfValidatorBase instance
+     * @param \sfValidatorBase $validator An sfValidatorBase instance
      */
-    public function addValidator(sfValidatorBase $validator)
+    public function addValidator(\sfValidatorBase $validator)
     {
         $this->validators[] = $validator;
     }
@@ -70,7 +71,7 @@ public function getValidators()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function asString($indent = 0)
     {
@@ -89,8 +90,8 @@ public function asString($indent = 0)
                 if ($options || $messages) {
                     $validators .= sprintf(
                         '(%s%s)',
-                        $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-                        $messages ? ', '.sfYamlInline::dump($messages) : ''
+                        $options ? \sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+                        $messages ? ', '.\sfYamlInline::dump($messages) : ''
                     );
                 }
             }
@@ -100,29 +101,29 @@ public function asString($indent = 0)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->setMessage('invalid', null);
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
-        $errors = new sfValidatorErrorSchema($this);
+        $errors = new \sfValidatorErrorSchema($this);
         foreach ($this->validators as $validator) {
             try {
                 return $validator->clean($value);
-            } catch (sfValidatorError $e) {
+            } catch (\sfValidatorError $e) {
                 $errors->addError($e);
             }
         }
 
         if ($this->getMessage('invalid')) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         throw $errors;
diff --git a/lib/validator/sfValidatorPass.class.php b/lib/validator/sfValidatorPass.class.php
index 24cf7592d..7b71325ed 100644
--- a/lib/validator/sfValidatorPass.class.php
+++ b/lib/validator/sfValidatorPass.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorPass extends sfValidatorBase
+class sfValidatorPass extends \sfValidatorBase
 {
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function clean($value)
     {
@@ -26,7 +27,7 @@ public function clean($value)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
diff --git a/lib/validator/sfValidatorRegex.class.php b/lib/validator/sfValidatorRegex.class.php
index 4e2ba6cd5..ebbdb229e 100644
--- a/lib/validator/sfValidatorRegex.class.php
+++ b/lib/validator/sfValidatorRegex.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorRegex extends sfValidatorString
+class sfValidatorRegex extends \sfValidatorString
 {
     /**
      * Returns the current validator's regular expression.
@@ -26,7 +27,7 @@ public function getPattern()
     {
         $pattern = $this->getOption('pattern');
 
-        return $pattern instanceof sfCallable ? $pattern->call() : $pattern;
+        return $pattern instanceof \sfCallable ? $pattern->call() : $pattern;
     }
 
     /**
@@ -40,9 +41,9 @@ public function getPattern()
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorString
+     * @see \sfValidatorString
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
@@ -51,7 +52,7 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorString
+     * @see \sfValidatorString
      */
     protected function doClean($value)
     {
@@ -63,7 +64,7 @@ protected function doClean($value)
             ($this->getOption('must_match') && !preg_match($pattern, $clean))
             || (!$this->getOption('must_match') && preg_match($pattern, $clean))
         ) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         return $clean;
diff --git a/lib/validator/sfValidatorSchema.class.php b/lib/validator/sfValidatorSchema.class.php
index 9064138c9..7fd058511 100644
--- a/lib/validator/sfValidatorSchema.class.php
+++ b/lib/validator/sfValidatorSchema.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,9 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorSchema extends sfValidatorBase implements ArrayAccess
+class sfValidatorSchema extends \sfValidatorBase implements \ArrayAccess
 {
-    protected $fields = array();
+    protected $fields = [];
     protected $preValidator;
     protected $postValidator;
 
@@ -35,16 +36,16 @@ class sfValidatorSchema extends sfValidatorBase implements ArrayAccess
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($fields = null, $options = array(), $messages = array())
+    public function __construct($fields = null, $options = [], $messages = [])
     {
         if (is_array($fields)) {
             foreach ($fields as $name => $validator) {
                 $this[$name] = $validator;
             }
         } elseif (null !== $fields) {
-            throw new InvalidArgumentException('sfValidatorSchema constructor takes an array of sfValidatorBase objects.');
+            throw new \InvalidArgumentException('sfValidatorSchema constructor takes an array of sfValidatorBase objects.');
         }
 
         parent::__construct($options, $messages);
@@ -66,7 +67,7 @@ public function __clone()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function clean($values)
     {
@@ -85,7 +86,7 @@ public function clean($values)
      *
      * @return array The cleaned values
      *
-     * @throws sfValidatorError
+     * @throws \sfValidatorError
      */
     public function preClean($values)
     {
@@ -106,7 +107,7 @@ public function preClean($values)
      *
      * @param array $values The input values
      *
-     * @throws sfValidatorError
+     * @throws \sfValidatorError
      */
     public function postClean($values)
     {
@@ -120,11 +121,11 @@ public function postClean($values)
     /**
      * Sets the pre validator.
      *
-     * @param sfValidatorBase $validator An sfValidatorBase instance
+     * @param \sfValidatorBase $validator An sfValidatorBase instance
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
-    public function setPreValidator(sfValidatorBase $validator)
+    public function setPreValidator(\sfValidatorBase $validator)
     {
         $this->preValidator = clone $validator;
 
@@ -134,7 +135,7 @@ public function setPreValidator(sfValidatorBase $validator)
     /**
      * Returns the pre validator.
      *
-     * @return sfValidatorBase A sfValidatorBase instance
+     * @return \sfValidatorBase A sfValidatorBase instance
      */
     public function getPreValidator()
     {
@@ -144,11 +145,11 @@ public function getPreValidator()
     /**
      * Sets the post validator.
      *
-     * @param sfValidatorBase $validator An sfValidatorBase instance
+     * @param \sfValidatorBase $validator An sfValidatorBase instance
      *
-     * @return sfValidatorBase The current validator instance
+     * @return \sfValidatorBase The current validator instance
      */
-    public function setPostValidator(sfValidatorBase $validator)
+    public function setPostValidator(\sfValidatorBase $validator)
     {
         $this->postValidator = clone $validator;
 
@@ -158,7 +159,7 @@ public function setPostValidator(sfValidatorBase $validator)
     /**
      * Returns the post validator.
      *
-     * @return sfValidatorBase An sfValidatorBase instance
+     * @return \sfValidatorBase An sfValidatorBase instance
      */
     public function getPostValidator()
     {
@@ -183,7 +184,7 @@ public function offsetExists($name)
      *
      * @param string $name The field name
      *
-     * @return sfValidatorBase The sfValidatorBase instance associated with the given name, null if it does not exist
+     * @return \sfValidatorBase The sfValidatorBase instance associated with the given name, null if it does not exist
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($name)
@@ -194,14 +195,14 @@ public function offsetGet($name)
     /**
      * Sets a field (implements the ArrayAccess interface).
      *
-     * @param string          $name      The field name
-     * @param sfValidatorBase $validator An sfValidatorBase instance
+     * @param string           $name      The field name
+     * @param \sfValidatorBase $validator An sfValidatorBase instance
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($name, $validator)
     {
-        if (!$validator instanceof sfValidatorBase) {
-            throw new InvalidArgumentException('A validator must be an instance of sfValidatorBase.');
+        if (!$validator instanceof \sfValidatorBase) {
+            throw new \InvalidArgumentException('A validator must be an instance of sfValidatorBase.');
         }
 
         $this->fields[$name] = clone $validator;
@@ -229,11 +230,11 @@ public function getFields()
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function asString($indent = 0)
     {
-        throw new Exception('Unable to convert a sfValidatorSchema to string.');
+        throw new \Exception('Unable to convert a sfValidatorSchema to string.');
     }
 
     /**
@@ -251,9 +252,9 @@ public function asString($indent = 0)
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addOption('allow_extra_fields', false);
         $this->addOption('filter_extra_fields', true);
@@ -263,25 +264,25 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($values)
     {
         if (null === $values) {
-            $values = array();
+            $values = [];
         }
 
         if (!is_array($values)) {
-            throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
+            throw new \InvalidArgumentException('You must pass an array parameter to the clean() method');
         }
 
-        $clean = array();
+        $clean = [];
         $unused = array_keys($this->fields);
-        $errorSchema = new sfValidatorErrorSchema($this);
+        $errorSchema = new \sfValidatorErrorSchema($this);
 
         // check that post_max_size has not been reached
         if (isset($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $this->getBytes(ini_get('post_max_size')) && 0 != ini_get('post_max_size')) {
-            $errorSchema->addError(new sfValidatorError($this, 'post_max_size'));
+            $errorSchema->addError(new \sfValidatorError($this, 'post_max_size'));
 
             throw $errorSchema;
         }
@@ -289,9 +290,9 @@ protected function doClean($values)
         // pre validator
         try {
             $values = $this->preClean($values);
-        } catch (sfValidatorErrorSchema $e) {
+        } catch (\sfValidatorErrorSchema $e) {
             $errorSchema->addErrors($e);
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $errorSchema->addError($e);
         }
 
@@ -300,7 +301,7 @@ protected function doClean($values)
             // field exists in our schema?
             if (!array_key_exists($name, $this->fields)) {
                 if (!$this->options['allow_extra_fields']) {
-                    $errorSchema->addError(new sfValidatorError($this, 'extra_fields', array('field' => $name)));
+                    $errorSchema->addError(new \sfValidatorError($this, 'extra_fields', ['field' => $name]));
                 } elseif (!$this->options['filter_extra_fields']) {
                     $clean[$name] = $value;
                 }
@@ -313,11 +314,11 @@ protected function doClean($values)
             // validate value
             try {
                 $clean[$name] = $this->fields[$name]->clean($value);
-            } catch (sfValidatorError $e) {
+            } catch (\sfValidatorError $e) {
                 $clean[$name] = null;
 
                 $errorSchema->addError($e, (string) $name);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $class = get_class($e);
 
                 throw new $class($e->getMessage().' of "'.$name.'" field');
@@ -329,7 +330,7 @@ protected function doClean($values)
             // validate value
             try {
                 $clean[$name] = $this->fields[$name]->clean(null);
-            } catch (sfValidatorError $e) {
+            } catch (\sfValidatorError $e) {
                 $clean[$name] = null;
 
                 $errorSchema->addError($e, (string) $name);
@@ -339,9 +340,9 @@ protected function doClean($values)
         // post validator
         try {
             $clean = $this->postClean($clean);
-        } catch (sfValidatorErrorSchema $e) {
+        } catch (\sfValidatorErrorSchema $e) {
             $errorSchema->addErrors($e);
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $errorSchema->addError($e);
         }
 
@@ -358,11 +359,11 @@ protected function getBytes($value)
         $number = (float) $value;
         $modifier = strtolower($value[strlen($value) - 1]);
 
-        $exp_by_modifier = array(
+        $exp_by_modifier = [
             'k' => 1,
             'm' => 2,
             'g' => 3,
-        );
+        ];
 
         if (array_key_exists($modifier, $exp_by_modifier)) {
             $exp = $exp_by_modifier[$modifier];
diff --git a/lib/validator/sfValidatorSchemaCompare.class.php b/lib/validator/sfValidatorSchemaCompare.class.php
index 3572aa1cb..8a2438c91 100644
--- a/lib/validator/sfValidatorSchemaCompare.class.php
+++ b/lib/validator/sfValidatorSchemaCompare.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorSchemaCompare extends sfValidatorSchema
+class sfValidatorSchemaCompare extends \sfValidatorSchema
 {
     public const EQUAL = '==';
     public const NOT_EQUAL = '!=';
@@ -50,9 +51,9 @@ class sfValidatorSchemaCompare extends sfValidatorSchema
      * @param array  $options    An array of options
      * @param array  $messages   An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($leftField, $operator, $rightField, $options = array(), $messages = array())
+    public function __construct($leftField, $operator, $rightField, $options = [], $messages = [])
     {
         $this->addOption('left_field', $leftField);
         $this->addOption('operator', $operator);
@@ -64,7 +65,7 @@ public function __construct($leftField, $operator, $rightField, $options = array
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function asString($indent = 0)
     {
@@ -76,8 +77,8 @@ public function asString($indent = 0)
         if ($options || $messages) {
             $arguments = sprintf(
                 '(%s%s)',
-                $options ? sfYamlInline::dump($options) : ($messages ? '{}' : ''),
-                $messages ? ', '.sfYamlInline::dump($messages) : ''
+                $options ? \sfYamlInline::dump($options) : ($messages ? '{}' : ''),
+                $messages ? ', '.\sfYamlInline::dump($messages) : ''
             );
         }
 
@@ -92,16 +93,16 @@ public function asString($indent = 0)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($values)
     {
         if (null === $values) {
-            $values = array();
+            $values = [];
         }
 
         if (!is_array($values)) {
-            throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
+            throw new \InvalidArgumentException('You must pass an array parameter to the clean() method');
         }
 
         $leftValue = isset($values[$this->getOption('left_field')]) ? $values[$this->getOption('left_field')] : null;
@@ -149,20 +150,20 @@ protected function doClean($values)
                 break;
 
             default:
-                throw new InvalidArgumentException(sprintf('The operator "%s" does not exist.', $this->getOption('operator')));
+                throw new \InvalidArgumentException(sprintf('The operator "%s" does not exist.', $this->getOption('operator')));
         }
 
         if (!$valid) {
-            $error = new sfValidatorError($this, 'invalid', array(
+            $error = new \sfValidatorError($this, 'invalid', [
                 'left_field' => $leftValue,
                 'right_field' => $rightValue,
                 'operator' => $this->getOption('operator'),
-            ));
+            ]);
             if ($this->getOption('throw_global_error')) {
                 throw $error;
             }
 
-            $errorSchema = new sfValidatorErrorSchema($this);
+            $errorSchema = new \sfValidatorErrorSchema($this);
             $errorSchema->addError($error, $this->getOption('left_field'));
 
             throw $errorSchema;
diff --git a/lib/validator/sfValidatorSchemaFilter.class.php b/lib/validator/sfValidatorSchemaFilter.class.php
index 6c15bd0d5..7cbeb50dc 100644
--- a/lib/validator/sfValidatorSchemaFilter.class.php
+++ b/lib/validator/sfValidatorSchemaFilter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,19 +16,19 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorSchemaFilter extends sfValidatorSchema
+class sfValidatorSchemaFilter extends \sfValidatorSchema
 {
     /**
      * Constructor.
      *
-     * @param string          $field     The field name
-     * @param sfValidatorBase $validator The validator
-     * @param array           $options   An array of options
-     * @param array           $messages  An array of error messages
+     * @param string           $field     The field name
+     * @param \sfValidatorBase $validator The validator
+     * @param array            $options   An array of options
+     * @param array            $messages  An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    public function __construct($field, sfValidatorBase $validator, $options = array(), $messages = array())
+    public function __construct($field, \sfValidatorBase $validator, $options = [], $messages = [])
     {
         $this->addOption('field', $field);
         $this->addOption('validator', $validator);
@@ -36,7 +37,7 @@ public function __construct($field, sfValidatorBase $validator, $options = array
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     public function asString($indent = 0)
     {
@@ -44,24 +45,24 @@ public function asString($indent = 0)
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($values)
     {
         if (null === $values) {
-            $values = array();
+            $values = [];
         }
 
         if (!is_array($values)) {
-            throw new InvalidArgumentException(sprintf('You must pass an array parameter to the clean() method for filter field "%s"', $this->getOption('field')));
+            throw new \InvalidArgumentException(sprintf('You must pass an array parameter to the clean() method for filter field "%s"', $this->getOption('field')));
         }
 
         $value = isset($values[$this->getOption('field')]) ? $values[$this->getOption('field')] : null;
 
         try {
             $values[$this->getOption('field')] = $this->getOption('validator')->clean($value);
-        } catch (sfValidatorError $error) {
-            $errorSchema = new sfValidatorErrorSchema($this);
+        } catch (\sfValidatorError $error) {
+            $errorSchema = new \sfValidatorErrorSchema($this);
             $errorSchema->addError($error, $this->getOption('field'));
 
             throw $errorSchema;
diff --git a/lib/validator/sfValidatorString.class.php b/lib/validator/sfValidatorString.class.php
index 35574e7d9..ca440706e 100644
--- a/lib/validator/sfValidatorString.class.php
+++ b/lib/validator/sfValidatorString.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorString extends sfValidatorBase
+class sfValidatorString extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -33,9 +34,9 @@ class sfValidatorString extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addMessage('max_length', '"%value%" is too long (%max_length% characters max).');
         $this->addMessage('min_length', '"%value%" is too short (%min_length% characters min).');
@@ -47,7 +48,7 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
@@ -56,11 +57,11 @@ protected function doClean($value)
         $length = function_exists('mb_strlen') ? mb_strlen($clean, $this->getCharset()) : strlen($clean);
 
         if ($this->hasOption('max_length') && $length > $this->getOption('max_length')) {
-            throw new sfValidatorError($this, 'max_length', array('value' => $value, 'max_length' => $this->getOption('max_length')));
+            throw new \sfValidatorError($this, 'max_length', ['value' => $value, 'max_length' => $this->getOption('max_length')]);
         }
 
         if ($this->hasOption('min_length') && $length < $this->getOption('min_length')) {
-            throw new sfValidatorError($this, 'min_length', array('value' => $value, 'min_length' => $this->getOption('min_length')));
+            throw new \sfValidatorError($this, 'min_length', ['value' => $value, 'min_length' => $this->getOption('min_length')]);
         }
 
         return $clean;
diff --git a/lib/validator/sfValidatorTime.class.php b/lib/validator/sfValidatorTime.class.php
index bda409397..63214a00b 100644
--- a/lib/validator/sfValidatorTime.class.php
+++ b/lib/validator/sfValidatorTime.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorTime extends sfValidatorBase
+class sfValidatorTime extends \sfValidatorBase
 {
     /**
      * Configures the current validator.
@@ -34,9 +35,9 @@ class sfValidatorTime extends sfValidatorBase
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addMessage('bad_format', '"%value%" does not match the time format (%time_format%).');
 
@@ -46,7 +47,7 @@ protected function configure($options = array(), $messages = array())
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function doClean($value)
     {
@@ -54,14 +55,14 @@ protected function doClean($value)
             $clean = $this->convertTimeArrayToTimestamp($value);
         } elseif ($regex = $this->getOption('time_format')) {
             if (!preg_match($regex, $value, $match)) {
-                throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'time_format' => $this->getOption('time_format_error') ?: $this->getOption('time_format')));
+                throw new \sfValidatorError($this, 'bad_format', ['value' => $value, 'time_format' => $this->getOption('time_format_error') ?: $this->getOption('time_format')]);
             }
 
             $clean = $this->convertTimeArrayToTimestamp($match);
         } elseif (!ctype_digit($value)) {
             $clean = strtotime($value);
             if (false === $clean) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         } else {
             $clean = (int) $value;
@@ -82,9 +83,9 @@ protected function doClean($value)
     protected function convertTimeArrayToTimestamp($value)
     {
         // all elements must be empty or a number
-        foreach (array('hour', 'minute', 'second') as $key) {
+        foreach (['hour', 'minute', 'second'] as $key) {
             if (isset($value[$key]) && !ctype_digit((string) $value[$key]) && !empty($value[$key])) {
-                throw new sfValidatorError($this, 'invalid', array('value' => $value));
+                throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
             }
         }
 
@@ -94,7 +95,7 @@ protected function convertTimeArrayToTimestamp($value)
             $this->isValueSet($value, 'second') && (!$this->isValueSet($value, 'minute') || !$this->isValueSet($value, 'hour'))
             || $this->isValueSet($value, 'minute') && !$this->isValueSet($value, 'hour')
         ) {
-            throw new sfValidatorError($this, 'invalid', array('value' => $value));
+            throw new \sfValidatorError($this, 'invalid', ['value' => $value]);
         }
 
         $clean = mktime(
@@ -104,7 +105,7 @@ protected function convertTimeArrayToTimestamp($value)
         );
 
         if (false === $clean) {
-            throw new sfValidatorError($this, 'invalid', array('value' => var_export($value, true)));
+            throw new \sfValidatorError($this, 'invalid', ['value' => var_export($value, true)]);
         }
 
         return $clean;
@@ -112,11 +113,11 @@ protected function convertTimeArrayToTimestamp($value)
 
     protected function isValueSet($values, $key)
     {
-        return isset($values[$key]) && !in_array($values[$key], array(null, ''), true);
+        return isset($values[$key]) && !in_array($values[$key], [null, ''], true);
     }
 
     /**
-     * @see sfValidatorBase
+     * @see \sfValidatorBase
      */
     protected function isEmpty($value)
     {
diff --git a/lib/validator/sfValidatorUrl.class.php b/lib/validator/sfValidatorUrl.class.php
index d63cf3a88..1f4c3e028 100644
--- a/lib/validator/sfValidatorUrl.class.php
+++ b/lib/validator/sfValidatorUrl.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfValidatorUrl extends sfValidatorRegex
+class sfValidatorUrl extends \sfValidatorRegex
 {
     public const REGEX_URL_FORMAT = '~^
       (%s)://                                 # protocol
@@ -46,13 +47,13 @@ public function generateRegex()
      * @param array $options  An array of options
      * @param array $messages An array of error messages
      *
-     * @see sfValidatorRegex
+     * @see \sfValidatorRegex
      */
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         parent::configure($options, $messages);
 
-        $this->addOption('protocols', array('http', 'https', 'ftp', 'ftps'));
-        $this->setOption('pattern', new sfCallable(array($this, 'generateRegex')));
+        $this->addOption('protocols', ['http', 'https', 'ftp', 'ftps']);
+        $this->setOption('pattern', new \sfCallable([$this, 'generateRegex']));
     }
 }
diff --git a/lib/view/sfPHPView.class.php b/lib/view/sfPHPView.class.php
index 6ccd701cd..f904ae3cd 100644
--- a/lib/view/sfPHPView.class.php
+++ b/lib/view/sfPHPView.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfPHPView extends sfView
+class sfPHPView extends \sfView
 {
     /**
      * Executes any presentation logic for this view.
@@ -61,7 +61,7 @@ public function configure()
     public function render()
     {
         $content = null;
-        if (sfConfig::get('sf_cache')) {
+        if (\sfConfig::get('sf_cache')) {
             $viewCache = $this->context->getViewCacheManager();
             $uri = $viewCache->getCurrentCacheKey();
 
@@ -83,7 +83,7 @@ public function render()
             // render template file
             $content = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
 
-            if (sfConfig::get('sf_cache') && null !== $uri) {
+            if (\sfConfig::get('sf_cache') && null !== $uri) {
                 $content = $viewCache->setActionCache($uri, $content, $this->isDecorator() ? $this->getDecoratorDirectory().'/'.$this->getDecoratorTemplate() : false);
             }
         }
@@ -109,7 +109,7 @@ protected function loadCoreAndStandardHelpers()
 
         $coreHelpersLoaded = 1;
 
-        $helpers = array_unique(array_merge(array('Helper', 'Url', 'Asset', 'Tag', 'Escaping'), sfConfig::get('sf_standard_helpers')));
+        $helpers = array_unique(array_merge(['Helper', 'Url', 'Asset', 'Tag', 'Escaping'], \sfConfig::get('sf_standard_helpers')));
 
         $this->context->getConfiguration()->loadHelpers($helpers);
     }
@@ -123,8 +123,8 @@ protected function loadCoreAndStandardHelpers()
      */
     protected function renderFile($_sfFile)
     {
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Render "%s"', $_sfFile))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Render "%s"', $_sfFile)]));
         }
 
         $this->loadCoreAndStandardHelpers();
@@ -139,7 +139,7 @@ protected function renderFile($_sfFile)
 
         try {
             require $_sfFile;
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // need to end output buffering before throwing the exception #7596
             ob_end_clean();
 
@@ -158,19 +158,19 @@ protected function renderFile($_sfFile)
      */
     protected function decorate($content)
     {
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Decorate content with "%s/%s"', $this->getDecoratorDirectory(), $this->getDecoratorTemplate()))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Decorate content with "%s/%s"', $this->getDecoratorDirectory(), $this->getDecoratorTemplate())]));
         }
 
         // set the decorator content as an attribute
         $attributeHolder = $this->attributeHolder;
 
-        $this->attributeHolder = $this->initializeAttributeHolder(array('sf_content' => new sfOutputEscaperSafe($content)));
+        $this->attributeHolder = $this->initializeAttributeHolder(['sf_content' => new \sfOutputEscaperSafe($content)]);
         $this->attributeHolder->set('sf_type', 'layout');
 
         // check to see if the decorator template exists
         if (!is_readable($this->getDecoratorDirectory().'/'.$this->getDecoratorTemplate())) {
-            throw new sfRenderException(sprintf('The decorator template "%s" does not exist or is unreadable in "%s".', $this->decoratorTemplate, $this->decoratorDirectory));
+            throw new \sfRenderException(sprintf('The decorator template "%s" does not exist or is unreadable in "%s".', $this->decoratorTemplate, $this->decoratorDirectory));
         }
 
         // render the decorator template and return the result
diff --git a/lib/view/sfPartialView.class.php b/lib/view/sfPartialView.class.php
index 344f504a4..fc1ba2760 100644
--- a/lib/view/sfPartialView.class.php
+++ b/lib/view/sfPartialView.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,17 +16,17 @@
  *
  * @version    SVN: $Id$
  */
-class sfPartialView extends sfPHPView
+class sfPartialView extends \sfPHPView
 {
     protected $viewCache;
     protected $checkCache = false;
     protected $cacheKey;
-    protected $partialVars = array();
+    protected $partialVars = [];
 
     /**
      * Constructor.
      *
-     * @see sfView
+     * @see \sfView
      */
     public function initialize($context, $moduleName, $actionName, $viewName)
     {
@@ -33,7 +34,7 @@ public function initialize($context, $moduleName, $actionName, $viewName)
 
         $this->viewCache = $this->context->getViewCacheManager();
 
-        if (sfConfig::get('sf_cache')) {
+        if (\sfConfig::get('sf_cache')) {
             $this->checkCache = $this->viewCache->isActionCacheable($moduleName, $actionName);
         }
 
@@ -74,8 +75,8 @@ public function configure()
      */
     public function render()
     {
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
-            $timer = sfTimerManager::getTimer(sprintf('Partial "%s/%s"', $this->moduleName, $this->actionName));
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
+            $timer = \sfTimerManager::getTimer(sprintf('Partial "%s/%s"', $this->moduleName, $this->actionName));
         }
 
         if ($retval = $this->getCache()) {
@@ -106,7 +107,7 @@ public function render()
 
             // render template
             $retval = $this->renderFile($this->getDirectory().'/'.$this->getTemplate());
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             if ($this->checkCache) {
                 $this->context->setResponse($mainResponse);
                 $mainResponse->merge($response);
@@ -121,7 +122,7 @@ public function render()
             $mainResponse->merge($response);
         }
 
-        if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled')) {
+        if (\sfConfig::get('sf_debug') && \sfConfig::get('sf_logging_enabled')) {
             $timer->addTime();
         }
 
diff --git a/lib/view/sfView.class.php b/lib/view/sfView.class.php
index 3efbf0f8a..0edf04e4c 100644
--- a/lib/view/sfView.class.php
+++ b/lib/view/sfView.class.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr <sean@code-box.org>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -72,7 +72,7 @@ abstract class sfView
     protected $decoratorDirectory;
     protected $decoratorTemplate;
     protected $directory;
-    protected $componentSlots = array();
+    protected $componentSlots = [];
     protected $template;
     protected $attributeHolder;
     protected $parameterHolder;
@@ -103,9 +103,9 @@ public function __construct($context, $moduleName, $actionName, $viewName)
      */
     public function __call($method, $arguments)
     {
-        $event = $this->dispatcher->notifyUntil(new sfEvent($this, 'view.method_not_found', array('method' => $method, 'arguments' => $arguments)));
+        $event = $this->dispatcher->notifyUntil(new \sfEvent($this, 'view.method_not_found', ['method' => $method, 'arguments' => $arguments]));
         if (!$event->isProcessed()) {
-            throw new sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
+            throw new \sfException(sprintf('Call to undefined method %s::%s.', get_class($this), $method));
         }
 
         return $event->getReturnValue();
@@ -114,10 +114,10 @@ public function __call($method, $arguments)
     /**
      * Initializes this view.
      *
-     * @param sfContext $context    The current application context
-     * @param string    $moduleName The module name for this view
-     * @param string    $actionName The action name for this view
-     * @param string    $viewName   The view name
+     * @param \sfContext $context    The current application context
+     * @param string     $moduleName The module name for this view
+     * @param string     $actionName The action name for this view
+     * @param string     $viewName   The view name
      *
      * @return bool true, if initialization completes successfully, otherwise false
      */
@@ -130,12 +130,12 @@ public function initialize($context, $moduleName, $actionName, $viewName)
         $this->context = $context;
         $this->dispatcher = $context->getEventDispatcher();
 
-        sfOutputEscaper::markClassesAsSafe(array('sfForm', 'sfFormField', 'sfFormFieldSchema', 'sfModelGeneratorHelper'));
+        \sfOutputEscaper::markClassesAsSafe(['sfForm', 'sfFormField', 'sfFormFieldSchema', 'sfModelGeneratorHelper']);
 
         $this->attributeHolder = $this->initializeAttributeHolder();
 
-        $this->parameterHolder = new sfParameterHolder();
-        $this->parameterHolder->add(sfConfig::get('mod_'.strtolower($moduleName).'_view_param', array()));
+        $this->parameterHolder = new \sfParameterHolder();
+        $this->parameterHolder->add(\sfConfig::get('mod_'.strtolower($moduleName).'_view_param', []));
 
         $request = $context->getRequest();
 
@@ -153,7 +153,7 @@ public function initialize($context, $moduleName, $actionName, $viewName)
                 }
             }
         }
-        $this->dispatcher->notify(new sfEvent($this, 'view.configure_format', array('format' => $format, 'response' => $context->getResponse(), 'request' => $context->getRequest())));
+        $this->dispatcher->notify(new \sfEvent($this, 'view.configure_format', ['format' => $format, 'response' => $context->getResponse(), 'request' => $context->getRequest()]));
 
         // include view configuration
         $this->configure();
@@ -223,7 +223,7 @@ public function getTemplate()
     /**
      * Retrieves attributes for the current view.
      *
-     * @return sfParameterHolder The attribute parameter holder
+     * @return \sfParameterHolder The attribute parameter holder
      */
     public function getAttributeHolder()
     {
@@ -269,7 +269,7 @@ public function setAttribute($name, $value)
     /**
      * Retrieves the parameters for the current view.
      *
-     * @return sfParameterHolder The parameter holder
+     * @return \sfParameterHolder The parameter holder
      */
     public function getParameterHolder()
     {
@@ -376,7 +376,7 @@ public function setDecoratorTemplate($template)
             $template .= $this->getExtension();
         }
 
-        if (sfToolkit::isPathAbsolute($template)) {
+        if (\sfToolkit::isPathAbsolute($template)) {
             $this->decoratorDirectory = dirname($template);
             $this->decoratorTemplate = basename($template);
         } else {
@@ -407,7 +407,7 @@ public function setDirectory($directory)
      */
     public function setComponentSlot($attributeName, $moduleName, $componentName)
     {
-        $this->componentSlots[$attributeName] = array();
+        $this->componentSlots[$attributeName] = [];
         $this->componentSlots[$attributeName]['module_name'] = $moduleName;
         $this->componentSlots[$attributeName]['component_name'] = $componentName;
     }
@@ -434,7 +434,7 @@ public function hasComponentSlot($name)
     public function getComponentSlot($name)
     {
         if (isset($this->componentSlots[$name]) && $this->componentSlots[$name]['module_name'] && $this->componentSlots[$name]['component_name']) {
-            return array($this->componentSlots[$name]['module_name'], $this->componentSlots[$name]['component_name']);
+            return [$this->componentSlots[$name]['module_name'], $this->componentSlots[$name]['component_name']];
         }
 
         return null;
@@ -450,7 +450,7 @@ public function getComponentSlot($name)
      */
     public function setTemplate($template)
     {
-        if (sfToolkit::isPathAbsolute($template)) {
+        if (\sfToolkit::isPathAbsolute($template)) {
             $this->directory = dirname($template);
             $this->template = basename($template);
         } else {
@@ -509,38 +509,38 @@ public function getViewName()
         return $this->viewName;
     }
 
-    protected function initializeAttributeHolder($attributes = array())
+    protected function initializeAttributeHolder($attributes = [])
     {
-        return new sfViewParameterHolder($this->dispatcher, $attributes, array(
-            'escaping_method' => sfConfig::get('sf_escaping_method'),
-            'escaping_strategy' => sfConfig::get('sf_escaping_strategy'),
-        ));
+        return new \sfViewParameterHolder($this->dispatcher, $attributes, [
+            'escaping_method' => \sfConfig::get('sf_escaping_method'),
+            'escaping_strategy' => \sfConfig::get('sf_escaping_strategy'),
+        ]);
     }
 
     /**
      * Executes a basic pre-render check to verify all required variables exist
      * and that the template is readable.
      *
-     * @throws sfRenderException If the pre-render check fails
+     * @throws \sfRenderException If the pre-render check fails
      */
     protected function preRenderCheck()
     {
         if (null === $this->template) {
             // a template has not been set
-            throw new sfRenderException('A template has not been set.');
+            throw new \sfRenderException('A template has not been set.');
         }
 
         if (!is_readable($this->directory.'/'.$this->template)) {
             // 404?
             if ('404' == $this->context->getResponse()->getStatusCode()) {
                 // use default exception templates
-                $this->template = sfException::getTemplatePathForError($this->context->getRequest()->getRequestFormat(), false);
+                $this->template = \sfException::getTemplatePathForError($this->context->getRequest()->getRequestFormat(), false);
                 $this->directory = dirname($this->template);
                 $this->template = basename($this->template);
                 $this->setAttribute('code', '404');
                 $this->setAttribute('text', 'Not Found');
             } else {
-                throw new sfRenderException(sprintf('The template "%s" does not exist or is unreadable in "%s".', $this->template, $this->directory));
+                throw new \sfRenderException(sprintf('The template "%s" does not exist or is unreadable in "%s".', $this->template, $this->directory));
             }
         }
     }
diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
index dd5201b00..f01de12db 100644
--- a/lib/view/sfViewCacheManager.class.php
+++ b/lib/view/sfViewCacheManager.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,23 +22,23 @@
  */
 class sfViewCacheManager
 {
-    public $options = array();
+    public $options = [];
 
     protected $cache;
-    protected $cacheConfig = array();
+    protected $cacheConfig = [];
     protected $context;
     protected $dispatcher;
     protected $controller;
     protected $routing;
     protected $request;
-    protected $loaded = array();
+    protected $loaded = [];
 
     /**
      * Class constructor.
      *
      * @see initialize()
      */
-    public function __construct($context, sfCache $cache, $options = array())
+    public function __construct($context, \sfCache $cache, $options = [])
     {
         $this->initialize($context, $cache, $options);
     }
@@ -45,26 +46,26 @@ public function __construct($context, sfCache $cache, $options = array())
     /**
      * Initializes the cache manager.
      *
-     * @param sfContext $context Current application context
-     * @param sfCache   $cache   An sfCache instance
+     * @param \sfContext $context Current application context
+     * @param \sfCache   $cache   An sfCache instance
      */
-    public function initialize($context, sfCache $cache, $options = array())
+    public function initialize($context, \sfCache $cache, $options = [])
     {
         $this->context = $context;
         $this->dispatcher = $context->getEventDispatcher();
         $this->controller = $context->getController();
         $this->request = $context->getRequest();
-        $this->options = array_merge(array(
+        $this->options = array_merge([
             'cache_key_use_vary_headers' => true,
             'cache_key_use_host_name' => true,
-        ), $options);
+        ], $options);
 
-        if (sfConfig::get('sf_web_debug')) {
-            $this->dispatcher->connect('view.cache.filter_content', array($this, 'decorateContentWithDebug'));
+        if (\sfConfig::get('sf_web_debug')) {
+            $this->dispatcher->connect('view.cache.filter_content', [$this, 'decorateContentWithDebug']);
         }
 
         // empty configuration
-        $this->cacheConfig = array();
+        $this->cacheConfig = [];
 
         // cache instance
         $this->cache = $cache;
@@ -76,7 +77,7 @@ public function initialize($context, sfCache $cache, $options = array())
     /**
      * Retrieves the current cache context.
      *
-     * @return sfContext The sfContext instance
+     * @return \sfContext The sfContext instance
      */
     public function getContext()
     {
@@ -86,7 +87,7 @@ public function getContext()
     /**
      * Retrieves the current cache object.
      *
-     * @return sfCache The current cache object
+     * @return \sfCache The current cache object
      */
     public function getCache()
     {
@@ -118,16 +119,16 @@ public function getCache()
      */
     public function generateCacheKey($internalUri, $hostName = '', $vary = '', $contextualPrefix = '')
     {
-        if ($callable = sfConfig::get('sf_cache_namespace_callable')) {
+        if ($callable = \sfConfig::get('sf_cache_namespace_callable')) {
             if (!is_callable($callable)) {
-                throw new sfException(sprintf('"%s" cannot be called as a function.', var_export($callable, true)));
+                throw new \sfException(sprintf('"%s" cannot be called as a function.', var_export($callable, true)));
             }
 
             return call_user_func($callable, $internalUri, $hostName, $vary, $contextualPrefix, $this);
         }
 
-        if (0 === strpos($internalUri, '@') && false === strpos($internalUri, '@sf_cache_partial')) {
-            throw new sfException('A cache key cannot be generated for an internal URI using the @rule syntax');
+        if (str_starts_with($internalUri, '@') &&   !str_contains($internalUri, '@sf_cache_partial')) {
+            throw new \sfException('A cache key cannot be generated for an internal URI using the @rule syntax');
         }
 
         $cacheKey = '';
@@ -139,8 +140,8 @@ public function generateCacheKey($internalUri, $hostName = '', $vary = '', $cont
 
                 // if there is no module/action, it means that we have a 404 and the user is trying to cache it
                 if (!isset($params['module']) || !isset($params['action'])) {
-                    $params['module'] = sfConfig::get('sf_error_404_module');
-                    $params['action'] = sfConfig::get('sf_error_404_action');
+                    $params['module'] = \sfConfig::get('sf_error_404_module');
+                    $params['action'] = \sfConfig::get('sf_error_404_action');
                 }
                 $cacheKey = $this->convertParametersToKey($params);
             } else {
@@ -169,22 +170,22 @@ public function generateCacheKey($internalUri, $hostName = '', $vary = '', $cont
         }
 
         // normalize to a leading slash
-        if (0 !== strpos($cacheKey, '/')) {
+        if (!str_starts_with($cacheKey, '/')) {
             $cacheKey = '/'.$cacheKey;
         }
 
         // distinguish multiple slashes
-        while (false !== strpos($cacheKey, '//')) {
+        while (str_contains($cacheKey, '//')) {
             $cacheKey = str_replace('//', '/'.substr(sha1($cacheKey), 0, 7).'/', $cacheKey);
         }
 
         // prevent directory traversal
-        return strtr($cacheKey, array(
+        return strtr($cacheKey, [
             '/.' => '/_.',
             '/_' => '/__',
             '\\.' => '\\_.',
             '\\_' => '\\__',
-        ));
+        ]);
     }
 
     /**
@@ -194,7 +195,7 @@ public function generateCacheKey($internalUri, $hostName = '', $vary = '', $cont
      * @param string $actionName Action name
      * @param array  $options    Options for the cache
      */
-    public function addCache($moduleName, $actionName, $options = array())
+    public function addCache($moduleName, $actionName, $options = [])
     {
         // normalize vary headers
         if (isset($options['vary'])) {
@@ -205,15 +206,15 @@ public function addCache($moduleName, $actionName, $options = array())
 
         $options['lifeTime'] = isset($options['lifeTime']) ? $options['lifeTime'] : 0;
         if (!isset($this->cacheConfig[$moduleName])) {
-            $this->cacheConfig[$moduleName] = array();
+            $this->cacheConfig[$moduleName] = [];
         }
-        $this->cacheConfig[$moduleName][$actionName] = array(
+        $this->cacheConfig[$moduleName][$actionName] = [
             'withLayout' => isset($options['withLayout']) ? $options['withLayout'] : false,
             'lifeTime' => $options['lifeTime'],
             'clientLifeTime' => isset($options['clientLifeTime']) ? $options['clientLifeTime'] : $options['lifeTime'],
             'contextual' => isset($options['contextual']) ? $options['contextual'] : false,
-            'vary' => isset($options['vary']) ? $options['vary'] : array(),
-        );
+            'vary' => isset($options['vary']) ? $options['vary'] : [],
+        ];
     }
 
     /**
@@ -286,7 +287,7 @@ public function isContextual($internalUri)
      */
     public function getVary($internalUri)
     {
-        return $this->getCacheConfig($internalUri, 'vary', array());
+        return $this->getCacheConfig($internalUri, 'vary', []);
     }
 
     /**
@@ -304,7 +305,7 @@ public function getVary($internalUri)
      */
     public function isCacheable($internalUri)
     {
-        if ($this->request instanceof sfWebRequest && !$this->request->isMethod(sfRequest::GET)) {
+        if ($this->request instanceof \sfWebRequest && !$this->request->isMethod(\sfRequest::GET)) {
             return false;
         }
 
@@ -338,7 +339,7 @@ public function isCacheable($internalUri)
      */
     public function isActionCacheable($moduleName, $actionName)
     {
-        if ($this->request instanceof sfWebRequest && !$this->request->isMethod(sfRequest::GET)) {
+        if ($this->request instanceof \sfWebRequest && !$this->request->isMethod(\sfRequest::GET)) {
             return false;
         }
 
@@ -370,8 +371,8 @@ public function get($internalUri)
 
         $retval = $this->cache->get($this->generateCacheKey($internalUri));
 
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Cache for "%s" %s', $internalUri, null !== $retval ? 'exists' : 'does not exist'))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Cache for "%s" %s', $internalUri, null !== $retval ? 'exists' : 'does not exist')]));
         }
 
         return $retval;
@@ -409,12 +410,12 @@ public function set($data, $internalUri)
 
         try {
             $ret = $this->cache->set($this->generateCacheKey($internalUri), $data, $this->getLifeTime($internalUri));
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return false;
         }
 
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Save cache for "%s"', $internalUri))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Save cache for "%s"', $internalUri)]));
         }
 
         return true;
@@ -432,8 +433,8 @@ public function set($data, $internalUri)
      */
     public function remove($internalUri, $hostName = '', $vary = '', $contextualPrefix = '**')
     {
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Remove cache for "%s"', $internalUri))));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', [sprintf('Remove cache for "%s"', $internalUri)]));
         }
 
         $cacheKey = $this->generateCacheKey($internalUri, $hostName, $vary, $contextualPrefix);
@@ -488,7 +489,7 @@ public function getTimeout($internalUri)
      *
      * @return bool true, if success otherwise false
      */
-    public function start($name, $lifeTime, $clientLifeTime = null, $vary = array())
+    public function start($name, $lifeTime, $clientLifeTime = null, $vary = [])
     {
         $internalUri = $this->routing->getCurrentInternalUri();
 
@@ -498,7 +499,7 @@ public function start($name, $lifeTime, $clientLifeTime = null, $vary = array())
 
         // add cache config to cache manager
         list($route_name, $params) = $this->controller->convertUrlStringToParameters($internalUri);
-        $this->addCache($params['module'], $params['action'], array('withLayout' => false, 'lifeTime' => $lifeTime, 'clientLifeTime' => $clientLifeTime, 'vary' => $vary));
+        $this->addCache($params['module'], $params['action'], ['withLayout' => false, 'lifeTime' => $lifeTime, 'clientLifeTime' => $clientLifeTime, 'vary' => $vary]);
 
         // get data from cache if available
         $data = $this->get($internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name);
@@ -528,7 +529,7 @@ public function stop($name)
 
         try {
             $this->set($data, $internalUri.(strpos($internalUri, '?') ? '&' : '?').'_sf_cache_key='.$name);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
         }
 
         return $data;
@@ -545,8 +546,8 @@ public function computeCacheKey(array $parameters)
             return $parameters['sf_cache_key'];
         }
 
-        if (sfConfig::get('sf_logging_enabled')) {
-            $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Generate cache key')));
+        if (\sfConfig::get('sf_logging_enabled')) {
+            $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Generate cache key']));
         }
         ksort($parameters);
 
@@ -626,8 +627,8 @@ public function getPartialCache($module, $action, $cacheKey)
         $content = $cache['content'];
         $this->context->getResponse()->merge($cache['response']);
 
-        if (sfConfig::get('sf_web_debug')) {
-            $content = $this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false)), $content)->getReturnValue();
+        if (\sfConfig::get('sf_web_debug')) {
+            $content = $this->dispatcher->filter(new \sfEvent($this, 'view.cache.filter_content', ['response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false]), $content)->getReturnValue();
         }
 
         return $content;
@@ -650,10 +651,10 @@ public function setPartialCache($module, $action, $cacheKey, $content)
             return $content;
         }
 
-        $saved = $this->set(serialize(array('content' => $content, 'response' => $this->context->getResponse())), $uri);
+        $saved = $this->set(serialize(['content' => $content, 'response' => $this->context->getResponse()]), $uri);
 
-        if ($saved && sfConfig::get('sf_web_debug')) {
-            $content = $this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true)), $content)->getReturnValue();
+        if ($saved && \sfConfig::get('sf_web_debug')) {
+            $content = $this->dispatcher->filter(new \sfEvent($this, 'view.cache.filter_content', ['response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true]), $content)->getReturnValue();
         }
 
         return $content;
@@ -696,11 +697,11 @@ public function getActionCache($uri)
         $cache['response']->setEventDispatcher($this->dispatcher);
         $this->context->getResponse()->copyProperties($cache['response']);
 
-        if (sfConfig::get('sf_web_debug')) {
-            $content = $this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false)), $content)->getReturnValue();
+        if (\sfConfig::get('sf_web_debug')) {
+            $content = $this->dispatcher->filter(new \sfEvent($this, 'view.cache.filter_content', ['response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false]), $content)->getReturnValue();
         }
 
-        return array($content, $cache['decoratorTemplate']);
+        return [$content, $cache['decoratorTemplate']];
     }
 
     /**
@@ -718,10 +719,10 @@ public function setActionCache($uri, $content, $decoratorTemplate)
             return $content;
         }
 
-        $saved = $this->set(serialize(array('content' => $content, 'decoratorTemplate' => $decoratorTemplate, 'response' => $this->context->getResponse())), $uri);
+        $saved = $this->set(serialize(['content' => $content, 'decoratorTemplate' => $decoratorTemplate, 'response' => $this->context->getResponse()]), $uri);
 
-        if ($saved && sfConfig::get('sf_web_debug')) {
-            $content = $this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true)), $content)->getReturnValue();
+        if ($saved && \sfConfig::get('sf_web_debug')) {
+            $content = $this->dispatcher->filter(new \sfEvent($this, 'view.cache.filter_content', ['response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true]), $content)->getReturnValue();
         }
 
         return $content;
@@ -734,15 +735,15 @@ public function setActionCache($uri, $content, $decoratorTemplate)
      */
     public function setPageCache($uri)
     {
-        if (sfView::RENDER_CLIENT != $this->controller->getRenderMode()) {
+        if (\sfView::RENDER_CLIENT != $this->controller->getRenderMode()) {
             return;
         }
 
         // save content in cache
         $saved = $this->set(serialize($this->context->getResponse()), $uri);
 
-        if ($saved && sfConfig::get('sf_web_debug')) {
-            $content = $this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true)), $this->context->getResponse()->getContent())->getReturnValue();
+        if ($saved && \sfConfig::get('sf_web_debug')) {
+            $content = $this->dispatcher->filter(new \sfEvent($this, 'view.cache.filter_content', ['response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true]), $this->context->getResponse()->getContent())->getReturnValue();
 
             $this->context->getResponse()->setContent($content);
         }
@@ -766,14 +767,14 @@ public function getPageCache($uri)
         $cachedResponse = unserialize($retval);
         $cachedResponse->setEventDispatcher($this->dispatcher);
 
-        if (sfView::RENDER_VAR == $this->controller->getRenderMode()) {
+        if (\sfView::RENDER_VAR == $this->controller->getRenderMode()) {
             $this->controller->getActionStack()->getLastEntry()->setPresentation($cachedResponse->getContent());
             $this->context->getResponse()->setContent('');
         } else {
             $this->context->setResponse($cachedResponse);
 
-            if (sfConfig::get('sf_web_debug')) {
-                $content = $this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false)), $this->context->getResponse()->getContent())->getReturnValue();
+            if (\sfConfig::get('sf_web_debug')) {
+                $content = $this->dispatcher->filter(new \sfEvent($this, 'view.cache.filter_content', ['response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false]), $this->context->getResponse()->getContent())->getReturnValue();
 
                 $this->context->getResponse()->setContent($content);
             }
@@ -795,7 +796,7 @@ public function getCurrentCacheKey()
         $cacheKey = $this->routing->getCurrentInternalUri();
 
         if ($getParameters = $this->request->getGetParameters()) {
-            $cacheKey .= false === strpos((string) $cacheKey, '?') ? '?' : '&';
+            $cacheKey .=   !str_contains((string) $cacheKey, '?') ? '?' : '&';
             $cacheKey .= http_build_query($getParameters, '', '&');
         }
 
@@ -805,19 +806,19 @@ public function getCurrentCacheKey()
     /**
      * Listens to the 'view.cache.filter_content' event to decorate a chunk of HTML with cache information.
      *
-     * @param sfEvent $event   A sfEvent instance
-     * @param string  $content The HTML content
+     * @param \sfEvent $event   A sfEvent instance
+     * @param string   $content The HTML content
      *
      * @return string The decorated HTML string
      */
-    public function decorateContentWithDebug(sfEvent $event, $content)
+    public function decorateContentWithDebug(\sfEvent $event, $content)
     {
         // don't decorate if not html or if content is null
-        if (!$content || false === strpos($event['response']->getContentType(), 'html')) {
+        if (!$content ||   !str_contains($event['response']->getContentType(), 'html')) {
             return $content;
         }
 
-        $this->context->getConfiguration()->loadHelpers(array('Helper', 'Url', 'Asset', 'Tag'));
+        $this->context->getConfiguration()->loadHelpers(['Helper', 'Url', 'Asset', 'Tag']);
 
         $sf_cache_key = $this->generateCacheKey($event['uri']);
         $bgColor = $event['new'] ? '#9ff' : '#ff9';
@@ -828,10 +829,10 @@ public function decorateContentWithDebug(sfEvent $event, $content)
         return '
       <div id="main_'.$id.'" class="sfWebDebugActionCache" style="border: 1px solid #f00">
       <div id="sub_main_'.$id.'" class="sfWebDebugCache" style="background-color: '.$bgColor.'; border-right: 1px solid #f00; border-bottom: 1px solid #f00;">
-      <div style="height: 16px; padding: 2px"><a href="#" onclick="sfWebDebugToggle(\'sub_main_info_'.$id.'\'); return false;"><strong>cache information</strong></a>&nbsp;<a href="#" onclick="sfWebDebugToggle(\'sub_main_'.$id.'\'); document.getElementById(\'main_'.$id.'\').style.border = \'none\'; return false;">'.image_tag(sfConfig::get('sf_web_debug_web_dir').'/images/close.png', array('alt' => 'close')).'</a>&nbsp;</div>
+      <div style="height: 16px; padding: 2px"><a href="#" onclick="sfWebDebugToggle(\'sub_main_info_'.$id.'\'); return false;"><strong>cache information</strong></a>&nbsp;<a href="#" onclick="sfWebDebugToggle(\'sub_main_'.$id.'\'); document.getElementById(\'main_'.$id.'\').style.border = \'none\'; return false;">'.image_tag(\sfConfig::get('sf_web_debug_web_dir').'/images/close.png', ['alt' => 'close']).'</a>&nbsp;</div>
         <div style="padding: 2px; display: none" id="sub_main_info_'.$id.'">
-        [uri]&nbsp;'.htmlspecialchars($event['uri'], ENT_QUOTES, sfConfig::get('sf_charset')).'<br />
-        [key&nbsp;for&nbsp;cache]&nbsp;'.htmlspecialchars($cacheKey, ENT_QUOTES, sfConfig::get('sf_charset')).'<br />
+        [uri]&nbsp;'.htmlspecialchars($event['uri'], ENT_QUOTES, \sfConfig::get('sf_charset')).'<br />
+        [key&nbsp;for&nbsp;cache]&nbsp;'.htmlspecialchars($cacheKey, ENT_QUOTES, \sfConfig::get('sf_charset')).'<br />
         [life&nbsp;time]&nbsp;'.$this->getLifeTime($event['uri']).'&nbsp;seconds<br />
         [last&nbsp;modified]&nbsp;'.(time() - $lastModified).'&nbsp;seconds<br />
         &nbsp;<br />&nbsp;
@@ -865,7 +866,7 @@ protected function getCacheKeyVaryHeaderPart($internalUri, $vary = '')
 
             sort($varyHeaders);
             $request = $this->context->getRequest();
-            $varys = array();
+            $varys = [];
 
             foreach ($varyHeaders as $header) {
                 $varys[] = $header.'-'.preg_replace('/\W+/', '_', $request->getHttpHeader($header));
@@ -907,7 +908,7 @@ protected function getCacheKeyHostNamePart($hostName = '')
     protected function convertParametersToKey($params)
     {
         if (!isset($params['module']) || !isset($params['action'])) {
-            throw new sfException('A cache key must contain both a module and an action parameter');
+            throw new \sfException('A cache key must contain both a module and an action parameter');
         }
         $module = $params['module'];
         unset($params['module']);
@@ -959,9 +960,9 @@ protected function getCacheConfig($internalUri, $key, $defaultValue = null)
     protected function ignore()
     {
         // ignore cache parameter? (only available in debug mode)
-        if (sfConfig::get('sf_debug') && $this->context->getRequest()->getAttribute('sf_ignore_cache')) {
-            if (sfConfig::get('sf_logging_enabled')) {
-                $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Discard cache')));
+        if (\sfConfig::get('sf_debug') && $this->context->getRequest()->getAttribute('sf_ignore_cache')) {
+            if (\sfConfig::get('sf_logging_enabled')) {
+                $this->dispatcher->notify(new \sfEvent($this, 'application.log', ['Discard cache']));
             }
 
             return true;
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
index 817b1d127..f561437c8 100644
--- a/lib/view/sfViewParameterHolder.class.php
+++ b/lib/view/sfViewParameterHolder.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfViewParameterHolder extends sfParameterHolder
+class sfViewParameterHolder extends \sfParameterHolder
 {
     protected $dispatcher;
     protected $escaping;
@@ -26,7 +27,7 @@ class sfViewParameterHolder extends sfParameterHolder
     /**
      * Constructor.
      */
-    public function __construct(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
+    public function __construct(\sfEventDispatcher $dispatcher, $parameters = [], $options = [])
     {
         $this->initialize($dispatcher, $parameters, $options);
     }
@@ -38,7 +39,7 @@ public function __construct(sfEventDispatcher $dispatcher, $parameters = array()
      */
     public function __serialize()
     {
-        return array($this->getAll(), $this->escapingMethod, $this->escaping);
+        return [$this->getAll(), $this->escapingMethod, $this->escaping];
     }
 
     /**
@@ -49,7 +50,7 @@ public function __serialize()
     public function __unserialize($data)
     {
         list($this->parameters, $escapingMethod, $escaping) = $data;
-        $this->initialize(sfContext::hasInstance() ? sfContext::getInstance()->getEventDispatcher() : new sfEventDispatcher());
+        $this->initialize(\sfContext::hasInstance() ? \sfContext::getInstance()->getEventDispatcher() : new \sfEventDispatcher());
 
         $this->setEscapingMethod($escapingMethod);
         $this->setEscaping($escaping);
@@ -58,9 +59,9 @@ public function __unserialize($data)
     /**
      * Initializes this view parameter holder.
      *
-     * @param sfEventDispatcher $dispatcher an sfEventDispatcher instance
-     * @param array             $parameters an associative array of initialization parameters
-     * @param array             $options    An associative array of options.
+     * @param \sfEventDispatcher $dispatcher an sfEventDispatcher instance
+     * @param array              $parameters an associative array of initialization parameters
+     * @param array              $options    An associative array of options.
      *
      * <b>Options:</b>
      *
@@ -69,9 +70,9 @@ public function __unserialize($data)
      *
      * @return bool true, if initialization completes successfully, otherwise false
      *
-     * @throws sfInitializationException if an error occurs while initializing this view parameter holder
+     * @throws \sfInitializationException if an error occurs while initializing this view parameter holder
      */
-    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $parameters = [], $options = [])
     {
         $this->dispatcher = $dispatcher;
 
@@ -88,7 +89,7 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
      */
     public function isEscaped()
     {
-        return in_array($this->getEscaping(), array('on', 'true', true), true);
+        return in_array($this->getEscaping(), ['on', 'true', true], true);
     }
 
     /**
@@ -96,24 +97,24 @@ public function isEscaped()
      *
      * @return array An array of view parameters
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function toArray()
     {
-        $event = $this->dispatcher->filter(new sfEvent($this, 'template.filter_parameters'), $this->getAll());
+        $event = $this->dispatcher->filter(new \sfEvent($this, 'template.filter_parameters'), $this->getAll());
         $parameters = $event->getReturnValue();
-        $attributes = array();
+        $attributes = [];
 
         if ($this->isEscaped()) {
-            $attributes['sf_data'] = sfOutputEscaper::escape($this->getEscapingMethod(), $parameters);
+            $attributes['sf_data'] = \sfOutputEscaper::escape($this->getEscapingMethod(), $parameters);
             foreach ($attributes['sf_data'] as $key => $value) {
                 $attributes[$key] = $value;
             }
-        } elseif (in_array($this->getEscaping(), array('off', false), true)) {
+        } elseif (in_array($this->getEscaping(), ['off', false], true)) {
             $attributes = $parameters;
-            $attributes['sf_data'] = sfOutputEscaper::escape(ESC_RAW, $parameters);
+            $attributes['sf_data'] = \sfOutputEscaper::escape(ESC_RAW, $parameters);
         } else {
-            throw new InvalidArgumentException(sprintf('Unknown strategy "%s".', $this->getEscaping()));
+            throw new \InvalidArgumentException(sprintf('Unknown strategy "%s".', $this->getEscaping()));
         }
 
         return $attributes;
@@ -151,7 +152,7 @@ public function setEscaping($escaping)
      *
      * @return string The escaping method as the name of the function to use
      *
-     * @throws InvalidArgumentException If the method does not exist
+     * @throws \InvalidArgumentException If the method does not exist
      */
     public function getEscapingMethod()
     {
@@ -160,7 +161,7 @@ public function getEscapingMethod()
         }
 
         if (!defined($this->escapingMethod)) {
-            throw new InvalidArgumentException(sprintf('The escaping method "%s" is not available.', $this->escapingMethod));
+            throw new \InvalidArgumentException(sprintf('The escaping method "%s" is not available.', $this->escapingMethod));
         }
 
         return constant($this->escapingMethod);
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
index 8d00f8c9d..e0e9e1859 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nChoiceCountry extends sfWidgetFormChoice
+class sfWidgetFormI18nChoiceCountry extends \sfWidgetFormChoice
 {
     /**
      * Constructor.
@@ -30,9 +31,9 @@ class sfWidgetFormI18nChoiceCountry extends sfWidgetFormChoice
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoice
+     * @see \sfWidgetFormChoice
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -43,11 +44,11 @@ protected function configure($options = array(), $attributes = array())
         // populate choices with all countries
         $culture = isset($options['culture']) ? $options['culture'] : 'en';
 
-        $countries = sfCultureInfo::getInstance($culture)->getCountries(isset($options['countries']) ? $options['countries'] : null);
+        $countries = \sfCultureInfo::getInstance($culture)->getCountries(isset($options['countries']) ? $options['countries'] : null);
 
         $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
         if (false !== $addEmpty) {
-            $countries = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $countries);
+            $countries = array_merge(['' => true === $addEmpty ? '' : $addEmpty], $countries);
         }
 
         $this->setOption('choices', $countries);
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
index 24248a2f4..fdd2e7912 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nChoiceCurrency extends sfWidgetFormChoice
+class sfWidgetFormI18nChoiceCurrency extends \sfWidgetFormChoice
 {
     /**
      * Constructor.
@@ -30,9 +31,9 @@ class sfWidgetFormI18nChoiceCurrency extends sfWidgetFormChoice
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoice
+     * @see \sfWidgetFormChoice
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -43,11 +44,11 @@ protected function configure($options = array(), $attributes = array())
         // populate choices with all currencies
         $culture = isset($options['culture']) ? $options['culture'] : 'en';
 
-        $currencies = sfCultureInfo::getInstance($culture)->getCurrencies(isset($options['currencies']) ? $options['currencies'] : null);
+        $currencies = \sfCultureInfo::getInstance($culture)->getCurrencies(isset($options['currencies']) ? $options['currencies'] : null);
 
         $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
         if (false !== $addEmpty) {
-            $currencies = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $currencies);
+            $currencies = array_merge(['' => true === $addEmpty ? '' : $addEmpty], $currencies);
         }
 
         $this->setOption('choices', $currencies);
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
index 90fcc5caa..23264b59d 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nChoiceLanguage extends sfWidgetFormChoice
+class sfWidgetFormI18nChoiceLanguage extends \sfWidgetFormChoice
 {
     /**
      * Constructor.
@@ -30,9 +31,9 @@ class sfWidgetFormI18nChoiceLanguage extends sfWidgetFormChoice
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoice
+     * @see \sfWidgetFormChoice
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -43,11 +44,11 @@ protected function configure($options = array(), $attributes = array())
         // populate choices with all languages
         $culture = isset($options['culture']) ? $options['culture'] : 'en';
 
-        $languages = sfCultureInfo::getInstance($culture)->getLanguages(isset($options['languages']) ? $options['languages'] : null);
+        $languages = \sfCultureInfo::getInstance($culture)->getLanguages(isset($options['languages']) ? $options['languages'] : null);
 
         $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
         if (false !== $addEmpty) {
-            $languages = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $languages);
+            $languages = array_merge(['' => true === $addEmpty ? '' : $addEmpty], $languages);
         }
 
         $this->setOption('choices', $languages);
diff --git a/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php b/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
index 19c1d1641..f8aca7296 100644
--- a/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nChoiceTimezone extends sfWidgetFormChoice
+class sfWidgetFormI18nChoiceTimezone extends \sfWidgetFormChoice
 {
     /**
      * Constructor.
@@ -29,9 +30,9 @@ class sfWidgetFormI18nChoiceTimezone extends sfWidgetFormChoice
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoice
+     * @see \sfWidgetFormChoice
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -39,12 +40,12 @@ protected function configure($options = array(), $attributes = array())
         $this->addOption('add_empty', false);
 
         $culture = isset($options['culture']) ? $options['culture'] : 'en';
-        $timezones = array_keys(sfCultureInfo::getInstance($culture)->getTimeZones());
+        $timezones = array_keys(\sfCultureInfo::getInstance($culture)->getTimeZones());
         $timezones = array_combine($timezones, $timezones);
 
         $addEmpty = isset($options['add_empty']) ? $options['add_empty'] : false;
         if (false !== $addEmpty) {
-            $timezones = array_merge(array('' => true === $addEmpty ? '' : $addEmpty), $timezones);
+            $timezones = array_merge(['' => true === $addEmpty ? '' : $addEmpty], $timezones);
         }
 
         $this->setOption('choices', $timezones);
diff --git a/lib/widget/i18n/sfWidgetFormI18nDate.class.php b/lib/widget/i18n/sfWidgetFormI18nDate.class.php
index b0e99d4ee..dad718920 100644
--- a/lib/widget/i18n/sfWidgetFormI18nDate.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nDate.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nDate extends sfWidgetFormDate
+class sfWidgetFormI18nDate extends \sfWidgetFormDate
 {
     /**
      * Constructor.
@@ -28,9 +29,9 @@ class sfWidgetFormI18nDate extends sfWidgetFormDate
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormDate
+     * @see \sfWidgetFormDate
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -51,31 +52,31 @@ protected function getMonthFormat($culture, $monthFormat)
     {
         switch ($monthFormat) {
             case 'name':
-                return array_combine(range(1, 12), sfDateTimeFormatInfo::getInstance($culture)->getMonthNames());
+                return array_combine(range(1, 12), \sfDateTimeFormatInfo::getInstance($culture)->getMonthNames());
 
             case 'short_name':
-                return array_combine(range(1, 12), sfDateTimeFormatInfo::getInstance($culture)->getAbbreviatedMonthNames());
+                return array_combine(range(1, 12), \sfDateTimeFormatInfo::getInstance($culture)->getAbbreviatedMonthNames());
 
             case 'number':
                 return $this->getOption('months');
 
             default:
-                throw new InvalidArgumentException(sprintf('The month format "%s" is invalid.', $monthFormat));
+                throw new \InvalidArgumentException(sprintf('The month format "%s" is invalid.', $monthFormat));
         }
     }
 
     protected function getDateFormat($culture)
     {
-        $dateFormat = sfDateTimeFormatInfo::getInstance($culture)->getShortDatePattern();
+        $dateFormat = \sfDateTimeFormatInfo::getInstance($culture)->getShortDatePattern();
 
         if (false === ($dayPos = stripos($dateFormat, 'd')) || false === ($monthPos = stripos($dateFormat, 'm')) || false === ($yearPos = stripos($dateFormat, 'y'))) {
             return $this->getOption('format');
         }
 
-        return strtr($dateFormat, array(
+        return strtr($dateFormat, [
             substr($dateFormat, $dayPos, strripos($dateFormat, 'd') - $dayPos + 1) => '%day%',
             substr($dateFormat, $monthPos, strripos($dateFormat, 'm') - $monthPos + 1) => '%month%',
             substr($dateFormat, $yearPos, strripos($dateFormat, 'y') - $yearPos + 1) => '%year%',
-        ));
+        ]);
     }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
index c2b3e2d88..0381a3f0c 100644
--- a/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nDateTime extends sfWidgetFormDateTime
+class sfWidgetFormI18nDateTime extends \sfWidgetFormDateTime
 {
     /**
      * Constructor.
@@ -27,9 +28,9 @@ class sfWidgetFormI18nDateTime extends sfWidgetFormDateTime
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormDateTime
+     * @see \sfWidgetFormDateTime
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -38,22 +39,22 @@ protected function configure($options = array(), $attributes = array())
         $culture = isset($options['culture']) ? $options['culture'] : 'en';
 
         // format
-        $this->setOption('format', str_replace(array('{0}', '{1}'), array('%time%', '%date%'), sfDateTimeFormatInfo::getInstance($culture)->getDateTimeOrderPattern()));
+        $this->setOption('format', str_replace(['{0}', '{1}'], ['%time%', '%date%'], \sfDateTimeFormatInfo::getInstance($culture)->getDateTimeOrderPattern()));
     }
 
     /**
-     * @see sfWidgetFormDateTime
+     * @see \sfWidgetFormDateTime
      */
-    protected function getDateWidget($attributes = array())
+    protected function getDateWidget($attributes = [])
     {
-        return new sfWidgetFormI18nDate(array_merge(array('culture' => $this->getOption('culture')), $this->getOptionsFor('date')), $this->getAttributesFor('date', $attributes));
+        return new \sfWidgetFormI18nDate(array_merge(['culture' => $this->getOption('culture')], $this->getOptionsFor('date')), $this->getAttributesFor('date', $attributes));
     }
 
     /**
-     * @see sfWidgetFormDateTime
+     * @see \sfWidgetFormDateTime
      */
-    protected function getTimeWidget($attributes = array())
+    protected function getTimeWidget($attributes = [])
     {
-        return new sfWidgetFormI18nTime(array_merge(array('culture' => $this->getOption('culture')), $this->getOptionsFor('time')), $this->getAttributesFor('time', $attributes));
+        return new \sfWidgetFormI18nTime(array_merge(['culture' => $this->getOption('culture')], $this->getOptionsFor('time')), $this->getAttributesFor('time', $attributes));
     }
 }
diff --git a/lib/widget/i18n/sfWidgetFormI18nTime.class.php b/lib/widget/i18n/sfWidgetFormI18nTime.class.php
index e6eac87c3..67011aeb1 100644
--- a/lib/widget/i18n/sfWidgetFormI18nTime.class.php
+++ b/lib/widget/i18n/sfWidgetFormI18nTime.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormI18nTime extends sfWidgetFormTime
+class sfWidgetFormI18nTime extends \sfWidgetFormTime
 {
     /**
      * Constructor.
@@ -27,9 +28,9 @@ class sfWidgetFormI18nTime extends sfWidgetFormTime
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormTime
+     * @see \sfWidgetFormTime
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -46,16 +47,16 @@ protected function configure($options = array(), $attributes = array())
 
     protected function getTimeFormat($culture, $withSeconds)
     {
-        $timeFormat = $withSeconds ? sfDateTimeFormatInfo::getInstance($culture)->getMediumTimePattern() : sfDateTimeFormatInfo::getInstance($culture)->getShortTimePattern();
+        $timeFormat = $withSeconds ? \sfDateTimeFormatInfo::getInstance($culture)->getMediumTimePattern() : \sfDateTimeFormatInfo::getInstance($culture)->getShortTimePattern();
 
         if (false === ($hourPos = stripos($timeFormat, 'h')) || false === ($minutePos = stripos($timeFormat, 'm'))) {
             return $this->getOption('format');
         }
 
-        $trans = array(
+        $trans = [
             substr($timeFormat, $hourPos, strripos($timeFormat, 'h') - $hourPos + 1) => '%hour%',
             substr($timeFormat, $minutePos, strripos($timeFormat, 'm') - $minutePos + 1) => '%minute%',
-        );
+        ];
 
         if ($withSeconds) {
             if (false === $secondPos = stripos($timeFormat, 's')) {
diff --git a/lib/widget/sfWidget.class.php b/lib/widget/sfWidget.class.php
index 8bd37963e..449543317 100644
--- a/lib/widget/sfWidget.class.php
+++ b/lib/widget/sfWidget.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,9 @@
  */
 abstract class sfWidget
 {
-    protected $requiredOptions = array();
-    protected $attributes = array();
-    protected $options = array();
+    protected $requiredOptions = [];
+    protected $attributes = [];
+    protected $options = [];
 
     protected static $xhtml = true;
     protected static $charset = 'UTF-8';
@@ -30,10 +31,10 @@ abstract class sfWidget
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @throws InvalidArgumentException when a option is not supported
-     * @throws RuntimeException         when a required option is not given
+     * @throws \InvalidArgumentException when a option is not supported
+     * @throws \RuntimeException         when a required option is not given
      */
-    public function __construct($options = array(), $attributes = array())
+    public function __construct($options = [], $attributes = [])
     {
         $this->configure($options, $attributes);
 
@@ -42,12 +43,12 @@ public function __construct($options = array(), $attributes = array())
 
         // check option names
         if ($diff = array_diff($optionKeys, array_merge($currentOptionKeys, $this->requiredOptions))) {
-            throw new InvalidArgumentException(sprintf('%s does not support the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+            throw new \InvalidArgumentException(sprintf('%s does not support the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
         }
 
         // check required options
         if ($diff = array_diff($this->requiredOptions, array_merge($currentOptionKeys, $optionKeys))) {
-            throw new RuntimeException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
+            throw new \RuntimeException(sprintf('%s requires the following options: \'%s\'.', get_class($this), implode('\', \'', $diff)));
         }
 
         $this->options = array_merge($this->options, $options);
@@ -66,14 +67,14 @@ public function __construct($options = array(), $attributes = array())
      *
      * @return string A HTML representation of the widget
      */
-    abstract public function render($name, $value = null, $attributes = array(), $errors = array());
+    abstract public function render($name, $value = null, $attributes = [], $errors = []);
 
     /**
      * Adds a required option.
      *
      * @param string $name The option name
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function addRequiredOption($name)
     {
@@ -98,7 +99,7 @@ public function getRequiredOptions()
      * @param string $name  The option name
      * @param mixed  $value The default value
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function addOption($name, $value = null)
     {
@@ -113,14 +114,14 @@ public function addOption($name, $value = null)
      * @param string $name  The option name
      * @param mixed  $value The value
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      *
-     * @throws InvalidArgumentException when a option is not supported
+     * @throws \InvalidArgumentException when a option is not supported
      */
     public function setOption($name, $value)
     {
         if (!in_array($name, array_merge(array_keys($this->options), $this->requiredOptions))) {
-            throw new InvalidArgumentException(sprintf('%s does not support the following option: \'%s\'.', get_class($this), $name));
+            throw new \InvalidArgumentException(sprintf('%s does not support the following option: \'%s\'.', get_class($this), $name));
         }
 
         $this->options[$name] = $value;
@@ -168,7 +169,7 @@ public function getOptions()
      *
      * @param array $options An array of options
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setOptions($options)
     {
@@ -193,7 +194,7 @@ public function getAttributes()
      * @param string $name  The attribute name
      * @param string $value The attribute value
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setAttribute($name, $value)
     {
@@ -219,7 +220,7 @@ public function getAttribute($name)
      *
      * @param array $attributes An array of HTML attributes
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setAttributes($attributes)
     {
@@ -239,7 +240,7 @@ public function setAttributes($attributes)
      */
     public function getStylesheets()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -249,7 +250,7 @@ public function getStylesheets()
      */
     public function getJavaScripts()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -299,7 +300,7 @@ public static function isXhtml()
      * @param array  $attributes An array of HTML attributes to be merged with the default HTML attributes
      * @param string An HTML tag string
      */
-    public function renderTag($tag, $attributes = array())
+    public function renderTag($tag, $attributes = [])
     {
         if (empty($tag)) {
             return '';
@@ -316,7 +317,7 @@ public function renderTag($tag, $attributes = array())
      * @param array  $attributes An array of HTML attributes to be merged with the default HTML attributes
      * @param string An HTML tag string
      */
-    public function renderContentTag($tag, $content = null, $attributes = array())
+    public function renderContentTag($tag, $content = null, $attributes = [])
     {
         if (empty($tag)) {
             return '';
@@ -381,7 +382,7 @@ public function attributesToHtml($attributes)
      *
      * @see __construct()
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
     }
 
diff --git a/lib/widget/sfWidgetForm.class.php b/lib/widget/sfWidgetForm.class.php
index 6c9abbb1e..b89e9316d 100644
--- a/lib/widget/sfWidgetForm.class.php
+++ b/lib/widget/sfWidgetForm.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfWidgetForm extends sfWidget
+abstract class sfWidgetForm extends \sfWidget
 {
     protected $parent;
 
@@ -33,9 +34,9 @@ abstract class sfWidgetForm extends sfWidget
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidget
+     * @see \sfWidget
      */
-    public function __construct($options = array(), $attributes = array())
+    public function __construct($options = [], $attributes = [])
     {
         $this->addOption('id_format', '%s');
         $this->addOption('is_hidden', false);
@@ -51,7 +52,7 @@ public function __construct($options = array(), $attributes = array())
      *
      * @param string $value The default value
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setDefault($value)
     {
@@ -75,7 +76,7 @@ public function getDefault()
      *
      * @param string $value The label
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setLabel($value)
     {
@@ -99,7 +100,7 @@ public function getLabel()
      *
      * @param string $format The format string (must contain a %s for the id placeholder)
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setIdFormat($format)
     {
@@ -133,7 +134,7 @@ public function isHidden()
      *
      * @param bool $boolean true if the widget must be hidden, false otherwise
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setHidden($boolean)
     {
@@ -163,7 +164,7 @@ public function needsMultipartForm()
      *
      * @return string An HTML tag string
      */
-    public function renderTag($tag, $attributes = array())
+    public function renderTag($tag, $attributes = [])
     {
         if (empty($tag)) {
             return '';
@@ -186,7 +187,7 @@ public function renderTag($tag, $attributes = array())
      *
      * @return string An HTML tag string
      */
-    public function renderContentTag($tag, $content = null, $attributes = array())
+    public function renderContentTag($tag, $content = null, $attributes = [])
     {
         return parent::renderContentTag($tag, $content, $this->fixFormId($attributes));
     }
@@ -221,24 +222,24 @@ public function generateId($name, $value = null)
         }
 
         // check to see if we have an array variable for a field name
-        if (false !== strpos($name, '[')) {
-            $name = str_replace(array('[]', '][', '[', ']'), array(null !== $value && !is_array($value) ? '_'.$value : '', '_', '_', ''), $name);
+        if (str_contains($name, '[')) {
+            $name = str_replace(['[]', '][', '[', ']'], [null !== $value && !is_array($value) ? '_'.$value : '', '_', '_', ''], $name);
         }
 
-        if (false !== strpos($this->getOption('id_format'), '%s')) {
+        if (str_contains($this->getOption('id_format'), '%s')) {
             $name = sprintf($this->getOption('id_format'), $name);
         }
 
         // remove illegal characters
-        return preg_replace(array('/^[^A-Za-z]+/', '/[^A-Za-z0-9\:_\.\-]/'), array('', '_'), $name);
+        return preg_replace(['/^[^A-Za-z]+/', '/[^A-Za-z0-9\:_\.\-]/'], ['', '_'], $name);
     }
 
     /**
      * Sets the parent widget schema.
      *
-     * @return sfWidgetForm The current widget instance
+     * @return \sfWidgetForm The current widget instance
      */
-    public function setParent(sfWidgetFormSchema $widgetSchema = null)
+    public function setParent(\sfWidgetFormSchema $widgetSchema = null)
     {
         $this->parent = $widgetSchema;
 
@@ -250,7 +251,7 @@ public function setParent(sfWidgetFormSchema $widgetSchema = null)
      *
      * If no schema has been set with setWidgetSchema(), NULL is returned.
      *
-     * @return sfWidgetFormSchema|null
+     * @return \sfWidgetFormSchema|null
      */
     public function getParent()
     {
@@ -283,7 +284,7 @@ protected function fixFormId($attributes)
      */
     protected static function generateTwoCharsRange($start, $stop)
     {
-        $results = array();
+        $results = [];
         for ($i = $start; $i <= $stop; ++$i) {
             $results[$i] = sprintf('%02d', $i);
         }
@@ -301,7 +302,7 @@ protected static function generateTwoCharsRange($start, $stop)
      *
      * @see sfWidgetFormSchemaFormatter::translate()
      */
-    protected function translate($text, array $parameters = array())
+    protected function translate($text, array $parameters = [])
     {
         if (null === $this->parent) {
             return $text;
@@ -320,13 +321,13 @@ protected function translate($text, array $parameters = array())
      *
      * @see sfWidgetFormSchemaFormatter::translate()
      */
-    protected function translateAll(array $texts, array $parameters = array())
+    protected function translateAll(array $texts, array $parameters = [])
     {
         if (null === $this->parent) {
             return $texts;
         }
 
-        $result = array();
+        $result = [];
 
         foreach ($texts as $key => $text) {
             $result[$key] = $this->parent->getFormFormatter()->translate($text, $parameters);
diff --git a/lib/widget/sfWidgetFormChoice.class.php b/lib/widget/sfWidgetFormChoice.class.php
index bf596c01e..aef90f420 100644
--- a/lib/widget/sfWidgetFormChoice.class.php
+++ b/lib/widget/sfWidgetFormChoice.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormChoice extends sfWidgetFormChoiceBase
+class sfWidgetFormChoice extends \sfWidgetFormChoiceBase
 {
     /**
      * Sets the format for HTML id attributes. This is made avaiable to the renderer,
@@ -23,7 +24,7 @@ class sfWidgetFormChoice extends sfWidgetFormChoiceBase
      *
      * @param string $format The format string (must contain a %s for the id placeholder)
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
     public function setIdFormat($format)
     {
@@ -40,9 +41,9 @@ public function setIdFormat($format)
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         if ($this->getOption('multiple')) {
             $attributes['multiple'] = 'multiple';
@@ -91,7 +92,7 @@ public function getRenderer()
         }
 
         $options = $this->options['renderer_options'];
-        $options['choices'] = new sfCallable(array($this, 'getChoices'));
+        $options['choices'] = new \sfCallable([$this, 'getChoices']);
 
         $renderer = new $class($options, $this->getAttributes());
 
@@ -124,16 +125,16 @@ public function getRenderer()
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoiceBase
+     * @see \sfWidgetFormChoiceBase
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
         $this->addOption('multiple', false);
         $this->addOption('expanded', false);
         $this->addOption('renderer_class', false);
-        $this->addOption('renderer_options', array());
+        $this->addOption('renderer_options', []);
         $this->addOption('renderer', false);
     }
 }
diff --git a/lib/widget/sfWidgetFormChoiceBase.class.php b/lib/widget/sfWidgetFormChoiceBase.class.php
index 8db910fe8..4f13bb3eb 100644
--- a/lib/widget/sfWidgetFormChoiceBase.class.php
+++ b/lib/widget/sfWidgetFormChoiceBase.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,18 +16,18 @@
  *
  * @version    SVN: $Id$
  */
-abstract class sfWidgetFormChoiceBase extends sfWidgetForm
+abstract class sfWidgetFormChoiceBase extends \sfWidgetForm
 {
     /**
      * Clones this object.
      */
     public function __clone()
     {
-        if ($this->getOption('choices') instanceof sfCallable) {
+        if ($this->getOption('choices') instanceof \sfCallable) {
             $callable = $this->getOption('choices')->getCallable();
             if (is_array($callable) && $callable[0] instanceof self) {
                 $callable[0] = $this;
-                $this->setOption('choices', new sfCallable($callable));
+                $this->setOption('choices', new \sfCallable($callable));
             }
         }
     }
@@ -40,7 +41,7 @@ public function getChoices()
     {
         $choices = $this->getOption('choices');
 
-        if ($choices instanceof sfCallable) {
+        if ($choices instanceof \sfCallable) {
             $choices = $choices->call();
         }
 
@@ -48,7 +49,7 @@ public function getChoices()
             return $choices;
         }
 
-        $results = array();
+        $results = [];
         foreach ($choices as $key => $choice) {
             if (is_array($choice)) {
                 $results[$this->translate($key)] = $this->translateAll($choice);
@@ -70,9 +71,9 @@ public function getChoices()
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('choices');
         $this->addOption('translate_choices', true);
diff --git a/lib/widget/sfWidgetFormDate.class.php b/lib/widget/sfWidgetFormDate.class.php
index cba225aac..17a0b6789 100644
--- a/lib/widget/sfWidgetFormDate.class.php
+++ b/lib/widget/sfWidgetFormDate.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormDate extends sfWidgetForm
+class sfWidgetFormDate extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,12 +28,12 @@ class sfWidgetFormDate extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         // convert value to an array
-        $default = array('year' => null, 'month' => null, 'day' => null);
+        $default = ['year' => null, 'month' => null, 'day' => null];
         if (is_array($value)) {
             $value = array_merge($default, $value);
         } else {
@@ -40,16 +41,16 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
             if (false === $value) {
                 $value = $default;
             } else {
-                $value = array('year' => date('Y', $value), 'month' => date('n', $value), 'day' => date('j', $value));
+                $value = ['year' => date('Y', $value), 'month' => date('n', $value), 'day' => date('j', $value)];
             }
         }
 
-        $date = array();
+        $date = [];
         $emptyValues = $this->getOption('empty_values');
 
-        $date['%day%'] = $this->renderDayWidget($name.'[day]', $value['day'], array('choices' => $this->getOption('can_be_empty') ? array('' => $emptyValues['day']) + $this->getOption('days') : $this->getOption('days'), 'id_format' => $this->getOption('id_format')), array_merge($this->attributes, $attributes));
-        $date['%month%'] = $this->renderMonthWidget($name.'[month]', $value['month'], array('choices' => $this->getOption('can_be_empty') ? array('' => $emptyValues['month']) + $this->getOption('months') : $this->getOption('months'), 'id_format' => $this->getOption('id_format')), array_merge($this->attributes, $attributes));
-        $date['%year%'] = $this->renderYearWidget($name.'[year]', $value['year'], array('choices' => $this->getOption('can_be_empty') ? array('' => $emptyValues['year']) + $this->getOption('years') : $this->getOption('years'), 'id_format' => $this->getOption('id_format')), array_merge($this->attributes, $attributes));
+        $date['%day%'] = $this->renderDayWidget($name.'[day]', $value['day'], ['choices' => $this->getOption('can_be_empty') ? ['' => $emptyValues['day']] + $this->getOption('days') : $this->getOption('days'), 'id_format' => $this->getOption('id_format')], array_merge($this->attributes, $attributes));
+        $date['%month%'] = $this->renderMonthWidget($name.'[month]', $value['month'], ['choices' => $this->getOption('can_be_empty') ? ['' => $emptyValues['month']] + $this->getOption('months') : $this->getOption('months'), 'id_format' => $this->getOption('id_format')], array_merge($this->attributes, $attributes));
+        $date['%year%'] = $this->renderYearWidget($name.'[year]', $value['year'], ['choices' => $this->getOption('can_be_empty') ? ['' => $emptyValues['year']] + $this->getOption('years') : $this->getOption('years'), 'id_format' => $this->getOption('id_format')], array_merge($this->attributes, $attributes));
 
         return strtr($this->getOption('format'), $date);
     }
@@ -70,9 +71,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addOption('format', '%month%/%day%/%year%');
         $this->addOption('days', parent::generateTwoCharsRange(1, 31));
@@ -81,7 +82,7 @@ protected function configure($options = array(), $attributes = array())
         $this->addOption('years', array_combine($years, $years));
 
         $this->addOption('can_be_empty', true);
-        $this->addOption('empty_values', array('year' => '', 'month' => '', 'day' => ''));
+        $this->addOption('empty_values', ['year' => '', 'month' => '', 'day' => '']);
     }
 
     /**
@@ -94,7 +95,7 @@ protected function configure($options = array(), $attributes = array())
      */
     protected function renderDayWidget($name, $value, $options, $attributes)
     {
-        $widget = new sfWidgetFormSelect($options, $attributes);
+        $widget = new \sfWidgetFormSelect($options, $attributes);
 
         return $widget->render($name, $value);
     }
@@ -109,7 +110,7 @@ protected function renderDayWidget($name, $value, $options, $attributes)
      */
     protected function renderMonthWidget($name, $value, $options, $attributes)
     {
-        $widget = new sfWidgetFormSelect($options, $attributes);
+        $widget = new \sfWidgetFormSelect($options, $attributes);
 
         return $widget->render($name, $value);
     }
@@ -124,7 +125,7 @@ protected function renderMonthWidget($name, $value, $options, $attributes)
      */
     protected function renderYearWidget($name, $value, $options, $attributes)
     {
-        $widget = new sfWidgetFormSelect($options, $attributes);
+        $widget = new \sfWidgetFormSelect($options, $attributes);
 
         return $widget->render($name, $value);
     }
diff --git a/lib/widget/sfWidgetFormDateRange.class.php b/lib/widget/sfWidgetFormDateRange.class.php
index 58a619456..b2ed314f3 100644
--- a/lib/widget/sfWidgetFormDateRange.class.php
+++ b/lib/widget/sfWidgetFormDateRange.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormDateRange extends sfWidgetForm
+class sfWidgetFormDateRange extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,17 +28,17 @@ class sfWidgetFormDateRange extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
-        $value = array_merge(array('from' => '', 'to' => ''), is_array($value) ? $value : array());
-        $attributes = array_merge(array('from' => array(), 'to' => array()), is_array($attributes) ? $attributes : array());
+        $value = array_merge(['from' => '', 'to' => ''], is_array($value) ? $value : []);
+        $attributes = array_merge(['from' => [], 'to' => []], is_array($attributes) ? $attributes : []);
 
-        return strtr($this->translate($this->getOption('template')), array(
+        return strtr($this->translate($this->getOption('template')), [
             '%from_date%' => $this->getOption('from_date')->render($name.'[from]', $value['from'], $attributes['from'], $errors),
             '%to_date%' => $this->getOption('to_date')->render($name.'[to]', $value['to'], $attributes['to'], $errors),
-        ));
+        ]);
     }
 
     /**
@@ -73,9 +74,9 @@ public function getJavaScripts()
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('from_date');
         $this->addRequiredOption('to_date');
diff --git a/lib/widget/sfWidgetFormDateTime.class.php b/lib/widget/sfWidgetFormDateTime.class.php
index 80c8209ef..65327adde 100644
--- a/lib/widget/sfWidgetFormDateTime.class.php
+++ b/lib/widget/sfWidgetFormDateTime.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormDateTime extends sfWidgetForm
+class sfWidgetFormDateTime extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,9 +28,9 @@ class sfWidgetFormDateTime extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         $date = $this->getDateWidget($attributes)->render($name, $value);
 
@@ -37,10 +38,10 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
             return $date;
         }
 
-        return strtr($this->getOption('format'), array(
+        return strtr($this->getOption('format'), [
             '%date%' => $date,
             '%time%' => $this->getTimeWidget($attributes)->render($name, $value),
-        ));
+        ]);
     }
 
     /**
@@ -61,12 +62,12 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
-        $this->addOption('date', array());
-        $this->addOption('time', array());
+        $this->addOption('date', []);
+        $this->addOption('time', []);
         $this->addOption('with_time', true);
         $this->addOption('format', '%date% %time%');
     }
@@ -76,11 +77,11 @@ protected function configure($options = array(), $attributes = array())
      *
      * @param array $attributes An array of attributes
      *
-     * @return sfWidgetForm A Widget representing the date
+     * @return \sfWidgetForm A Widget representing the date
      */
-    protected function getDateWidget($attributes = array())
+    protected function getDateWidget($attributes = [])
     {
-        return new sfWidgetFormDate($this->getOptionsFor('date'), $this->getAttributesFor('date', $attributes));
+        return new \sfWidgetFormDate($this->getOptionsFor('date'), $this->getAttributesFor('date', $attributes));
     }
 
     /**
@@ -88,11 +89,11 @@ protected function getDateWidget($attributes = array())
      *
      * @param array $attributes An array of attributes
      *
-     * @return sfWidgetForm A Widget representing the time
+     * @return \sfWidgetForm A Widget representing the time
      */
-    protected function getTimeWidget($attributes = array())
+    protected function getTimeWidget($attributes = [])
     {
-        return new sfWidgetFormTime($this->getOptionsFor('time'), $this->getAttributesFor('time', $attributes));
+        return new \sfWidgetFormTime($this->getOptionsFor('time'), $this->getAttributesFor('time', $attributes));
     }
 
     /**
@@ -102,17 +103,17 @@ protected function getTimeWidget($attributes = array())
      *
      * @return array An array of options
      *
-     * @throws InvalidArgumentException when option date|time type is not array
+     * @throws \InvalidArgumentException when option date|time type is not array
      */
     protected function getOptionsFor($type)
     {
         $options = $this->getOption($type);
         if (!is_array($options)) {
-            throw new InvalidArgumentException(sprintf('You must pass an array for the %s option.', $type));
+            throw new \InvalidArgumentException(sprintf('You must pass an array for the %s option.', $type));
         }
 
         // add id_format if it's not there already
-        $options += array('id_format' => $this->getOption('id_format'));
+        $options += ['id_format' => $this->getOption('id_format')];
 
         return $options;
     }
@@ -127,7 +128,7 @@ protected function getOptionsFor($type)
      */
     protected function getAttributesFor($type, $attributes)
     {
-        $defaults = isset($this->attributes[$type]) ? $this->attributes[$type] : array();
+        $defaults = isset($this->attributes[$type]) ? $this->attributes[$type] : [];
 
         return isset($attributes[$type]) ? array_merge($defaults, $attributes[$type]) : $defaults;
     }
diff --git a/lib/widget/sfWidgetFormFilterDate.class.php b/lib/widget/sfWidgetFormFilterDate.class.php
index 115a33eab..64be706bc 100644
--- a/lib/widget/sfWidgetFormFilterDate.class.php
+++ b/lib/widget/sfWidgetFormFilterDate.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormFilterDate extends sfWidgetFormDateRange
+class sfWidgetFormFilterDate extends \sfWidgetFormDateRange
 {
     /**
      * Renders the widget.
@@ -27,17 +28,17 @@ class sfWidgetFormFilterDate extends sfWidgetFormDateRange
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
-        $values = array_merge(array('is_empty' => ''), is_array($value) ? $value : array());
+        $values = array_merge(['is_empty' => ''], is_array($value) ? $value : []);
 
-        return strtr($this->getOption('filter_template'), array(
+        return strtr($this->getOption('filter_template'), [
             '%date_range%' => parent::render($name, $value, $attributes, $errors),
-            '%empty_checkbox%' => $this->getOption('with_empty') ? $this->renderTag('input', array('type' => 'checkbox', 'name' => $name.'[is_empty]', 'checked' => $values['is_empty'] ? 'checked' : '')) : '',
-            '%empty_label%' => $this->getOption('with_empty') ? $this->renderContentTag('label', $this->translate($this->getOption('empty_label')), array('for' => $this->generateId($name.'[is_empty]'))) : '',
-        ));
+            '%empty_checkbox%' => $this->getOption('with_empty') ? $this->renderTag('input', ['type' => 'checkbox', 'name' => $name.'[is_empty]', 'checked' => $values['is_empty'] ? 'checked' : '']) : '',
+            '%empty_label%' => $this->getOption('with_empty') ? $this->renderContentTag('label', $this->translate($this->getOption('empty_label')), ['for' => $this->generateId($name.'[is_empty]')]) : '',
+        ]);
     }
 
     /**
@@ -55,9 +56,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormFilterInput.class.php b/lib/widget/sfWidgetFormFilterInput.class.php
index 82f5ddf64..8999511db 100644
--- a/lib/widget/sfWidgetFormFilterInput.class.php
+++ b/lib/widget/sfWidgetFormFilterInput.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormFilterInput extends sfWidgetForm
+class sfWidgetFormFilterInput extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,17 +28,17 @@ class sfWidgetFormFilterInput extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
-        $values = array_merge(array('text' => '', 'is_empty' => false), is_array($value) ? $value : array());
+        $values = array_merge(['text' => '', 'is_empty' => false], is_array($value) ? $value : []);
 
-        return strtr($this->getOption('template'), array(
-            '%input%' => $this->renderTag('input', array_merge(array('type' => 'text', 'id' => $this->generateId($name), 'name' => $name.'[text]', 'value' => $values['text']), $attributes)),
-            '%empty_checkbox%' => $this->getOption('with_empty') ? $this->renderTag('input', array('type' => 'checkbox', 'name' => $name.'[is_empty]', 'checked' => $values['is_empty'] ? 'checked' : '')) : '',
-            '%empty_label%' => $this->getOption('with_empty') ? $this->renderContentTag('label', $this->translate($this->getOption('empty_label')), array('for' => $this->generateId($name.'[is_empty]'))) : '',
-        ));
+        return strtr($this->getOption('template'), [
+            '%input%' => $this->renderTag('input', array_merge(['type' => 'text', 'id' => $this->generateId($name), 'name' => $name.'[text]', 'value' => $values['text']], $attributes)),
+            '%empty_checkbox%' => $this->getOption('with_empty') ? $this->renderTag('input', ['type' => 'checkbox', 'name' => $name.'[is_empty]', 'checked' => $values['is_empty'] ? 'checked' : '']) : '',
+            '%empty_label%' => $this->getOption('with_empty') ? $this->renderContentTag('label', $this->translate($this->getOption('empty_label')), ['for' => $this->generateId($name.'[is_empty]')]) : '',
+        ]);
     }
 
     /**
@@ -53,9 +54,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addOption('with_empty', true);
         $this->addOption('empty_label', 'is empty');
diff --git a/lib/widget/sfWidgetFormInput.class.php b/lib/widget/sfWidgetFormInput.class.php
index 9a80b0416..6d9ddee18 100644
--- a/lib/widget/sfWidgetFormInput.class.php
+++ b/lib/widget/sfWidgetFormInput.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInput extends sfWidgetForm
+class sfWidgetFormInput extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,11 +28,11 @@ class sfWidgetFormInput extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
-        return $this->renderTag('input', array_merge(array('type' => $this->getOption('type'), 'name' => $name, 'value' => $value), $attributes));
+        return $this->renderTag('input', array_merge(['type' => $this->getOption('type'), 'name' => $name, 'value' => $value], $attributes));
     }
 
     /**
@@ -44,9 +45,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('type');
 
diff --git a/lib/widget/sfWidgetFormInputCheckbox.class.php b/lib/widget/sfWidgetFormInputCheckbox.class.php
index 250d1c185..5bb24cb9c 100644
--- a/lib/widget/sfWidgetFormInputCheckbox.class.php
+++ b/lib/widget/sfWidgetFormInputCheckbox.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputCheckbox extends sfWidgetFormInput
+class sfWidgetFormInputCheckbox extends \sfWidgetFormInput
 {
     /**
      * Constructor.
@@ -27,9 +28,9 @@ class sfWidgetFormInputCheckbox extends sfWidgetFormInput
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInput
+     * @see \sfWidgetFormInput
      */
-    public function __construct($options = array(), $attributes = array())
+    public function __construct($options = [], $attributes = [])
     {
         $this->addOption('value_attribute_value');
 
@@ -46,9 +47,9 @@ public function __construct($options = array(), $attributes = array())
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         if (null !== $value && false !== $value) {
             $attributes['checked'] = 'checked';
@@ -65,9 +66,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInput
+     * @see \sfWidgetFormInput
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormInputFile.class.php b/lib/widget/sfWidgetFormInputFile.class.php
index 125545cf4..58ca805a6 100644
--- a/lib/widget/sfWidgetFormInputFile.class.php
+++ b/lib/widget/sfWidgetFormInputFile.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputFile extends sfWidgetFormInput
+class sfWidgetFormInputFile extends \sfWidgetFormInput
 {
     /**
      * Configures the current widget.
@@ -23,9 +24,9 @@ class sfWidgetFormInputFile extends sfWidgetFormInput
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInput
+     * @see \sfWidgetFormInput
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormInputFileEditable.class.php b/lib/widget/sfWidgetFormInputFileEditable.class.php
index 508ad2ff2..e4f931204 100644
--- a/lib/widget/sfWidgetFormInputFileEditable.class.php
+++ b/lib/widget/sfWidgetFormInputFileEditable.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,7 +17,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputFileEditable extends sfWidgetFormInputFile
+class sfWidgetFormInputFileEditable extends \sfWidgetFormInputFile
 {
     /**
      * Renders the widget.
@@ -28,9 +29,9 @@ class sfWidgetFormInputFileEditable extends sfWidgetFormInputFile
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         $input = parent::render($name, $value, $attributes, $errors);
 
@@ -41,15 +42,15 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
         if ($this->getOption('with_delete')) {
             $deleteName = ']' == substr($name, -1) ? substr($name, 0, -1).'_delete]' : $name.'_delete';
 
-            $delete = $this->renderTag('input', array_merge(array('type' => 'checkbox', 'name' => $deleteName), $attributes));
+            $delete = $this->renderTag('input', array_merge(['type' => 'checkbox', 'name' => $deleteName], $attributes));
             $deleteLabel = $this->translate($this->getOption('delete_label'));
-            $deleteLabel = $this->renderContentTag('label', $deleteLabel, array_merge(array('for' => $this->generateId($deleteName))));
+            $deleteLabel = $this->renderContentTag('label', $deleteLabel, array_merge(['for' => $this->generateId($deleteName)]));
         } else {
             $delete = '';
             $deleteLabel = '';
         }
 
-        return strtr($this->getOption('template'), array('%input%' => $input, '%delete%' => $delete, '%delete_label%' => $deleteLabel, '%file%' => $this->getFileAsTag($attributes)));
+        return strtr($this->getOption('template'), ['%input%' => $input, '%delete%' => $delete, '%delete_label%' => $deleteLabel, '%file%' => $this->getFileAsTag($attributes)]);
     }
 
     /**
@@ -76,9 +77,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInputFile
+     * @see \sfWidgetFormInputFile
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -96,7 +97,7 @@ protected function configure($options = array(), $attributes = array())
     protected function getFileAsTag($attributes)
     {
         if ($this->getOption('is_image')) {
-            return false !== $this->getOption('file_src') ? $this->renderTag('img', array_merge(array('src' => $this->getOption('file_src')), $attributes)) : '';
+            return false !== $this->getOption('file_src') ? $this->renderTag('img', array_merge(['src' => $this->getOption('file_src')], $attributes)) : '';
         }
 
         return $this->getOption('file_src');
diff --git a/lib/widget/sfWidgetFormInputFileMulti.class.php b/lib/widget/sfWidgetFormInputFileMulti.class.php
index 12ed8ff29..d0b9119c5 100644
--- a/lib/widget/sfWidgetFormInputFileMulti.class.php
+++ b/lib/widget/sfWidgetFormInputFileMulti.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * sfWidgetFormInputFileMulti represents an upload HTML input tag with multiple option.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputFileMulti extends sfWidgetFormInputFile
+class sfWidgetFormInputFileMulti extends \sfWidgetFormInputFile
 {
     /**
      * Renders the widget.
@@ -19,9 +28,9 @@ class sfWidgetFormInputFileMulti extends sfWidgetFormInputFile
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         if ($this->getOption('multiple')) {
             $name .= '[]';
@@ -37,9 +46,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInput
+     * @see \sfWidgetFormInput
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormInputHidden.class.php b/lib/widget/sfWidgetFormInputHidden.class.php
index c5f23a571..e105e5960 100644
--- a/lib/widget/sfWidgetFormInputHidden.class.php
+++ b/lib/widget/sfWidgetFormInputHidden.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputHidden extends sfWidgetFormInput
+class sfWidgetFormInputHidden extends \sfWidgetFormInput
 {
     /**
      * Configures the current widget.
@@ -23,9 +24,9 @@ class sfWidgetFormInputHidden extends sfWidgetFormInput
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInput
+     * @see \sfWidgetFormInput
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormInputPassword.class.php b/lib/widget/sfWidgetFormInputPassword.class.php
index a5b1603f0..6d5332699 100644
--- a/lib/widget/sfWidgetFormInputPassword.class.php
+++ b/lib/widget/sfWidgetFormInputPassword.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputPassword extends sfWidgetFormInput
+class sfWidgetFormInputPassword extends \sfWidgetFormInput
 {
     /**
      * Renders the widget.
@@ -27,9 +28,9 @@ class sfWidgetFormInputPassword extends sfWidgetFormInput
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return parent::render($name, $this->getOption('always_render_empty') ? null : $value, $attributes, $errors);
     }
@@ -44,9 +45,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormInput
+     * @see \sfWidgetFormInput
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormInputRead.class.php b/lib/widget/sfWidgetFormInputRead.class.php
index 0e7e131dd..5c0c47851 100644
--- a/lib/widget/sfWidgetFormInputRead.class.php
+++ b/lib/widget/sfWidgetFormInputRead.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputRead extends sfWidgetFormInput
+class sfWidgetFormInputRead extends \sfWidgetFormInput
 {
     /**
      * Render the current widget.
@@ -27,14 +28,14 @@ class sfWidgetFormInputRead extends sfWidgetFormInput
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         $attributes = array_merge($this->attributes, $attributes);
-        $this->attributes = array();
+        $this->attributes = [];
 
-        $tag = parent::render($name, $value, array(), $errors);
+        $tag = parent::render($name, $value, [], $errors);
 
         $style = 'border: 0;';
         if (isset($attributes['style'])) {
@@ -42,12 +43,12 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
             unset($attributes['style']);
         }
 
-        return $tag.$this->renderTag('input', array_merge(array(
+        return $tag.$this->renderTag('input', array_merge([
             'type' => 'text',
             'value' => $this->getOption('text', $value),
             'readonly' => 'readonly',
             'style' => $style,
-        ), $attributes));
+        ], $attributes));
     }
 
     /**
@@ -56,9 +57,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormInputText.class.php b/lib/widget/sfWidgetFormInputText.class.php
index 1543a6628..39399b54e 100644
--- a/lib/widget/sfWidgetFormInputText.class.php
+++ b/lib/widget/sfWidgetFormInputText.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormInputText extends sfWidgetFormInput
+class sfWidgetFormInputText extends \sfWidgetFormInput
 {
     /**
      * Configures the current widget.
@@ -23,9 +24,9 @@ class sfWidgetFormInputText extends sfWidgetFormInput
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormSchema.class.php b/lib/widget/sfWidgetFormSchema.class.php
index 20126c1e6..f1a02689d 100644
--- a/lib/widget/sfWidgetFormSchema.class.php
+++ b/lib/widget/sfWidgetFormSchema.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +18,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSchema extends sfWidgetForm implements ArrayAccess
+class sfWidgetFormSchema extends \sfWidgetForm implements \ArrayAccess
 {
     public const FIRST = 'first';
     public const LAST = 'last';
@@ -26,10 +27,10 @@ class sfWidgetFormSchema extends sfWidgetForm implements ArrayAccess
 
     protected static $defaultFormatterName = 'table';
 
-    protected $formFormatters = array();
-    protected $fields = array();
-    protected $positions = array();
-    protected $helps = array();
+    protected $formFormatters = [];
+    protected $fields = [];
+    protected $positions = [];
+    protected $helps = [];
 
     /**
      * Constructor.
@@ -50,11 +51,11 @@ class sfWidgetFormSchema extends sfWidgetForm implements ArrayAccess
      * @param array $labels     An array of HTML labels
      * @param array $helps      An array of help texts
      *
-     * @throws InvalidArgumentException when the passed fields not null or array
+     * @throws \InvalidArgumentException when the passed fields not null or array
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function __construct($fields = null, $options = array(), $attributes = array(), $labels = array(), $helps = array())
+    public function __construct($fields = null, $options = [], $attributes = [], $labels = [], $helps = [])
     {
         $this->addOption('name_format', '%s');
         $this->addOption('form_formatter', null);
@@ -66,7 +67,7 @@ public function __construct($fields = null, $options = array(), $attributes = ar
                 $this[$name] = $widget;
             }
         } elseif (null !== $fields) {
-            throw new InvalidArgumentException('sfWidgetFormSchema constructor takes an array of sfWidget objects.');
+            throw new \InvalidArgumentException('sfWidgetFormSchema constructor takes an array of sfWidget objects.');
         }
 
         $this->setLabels($labels);
@@ -92,7 +93,7 @@ public function __clone()
      * @param string $name  The field name
      * @param string $value The default value (required - the default value is here because PHP do not allow signature changes with inheritance)
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setDefault($name, $value = null)
     {
@@ -118,7 +119,7 @@ public function getDefault($name = null)
      *
      * @param array $values The default values for the widget
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setDefaults(array $values)
     {
@@ -138,10 +139,10 @@ public function setDefaults(array $values)
      */
     public function getDefaults()
     {
-        $defaults = array();
+        $defaults = [];
 
         foreach ($this->fields as $name => $widget) {
-            $defaults[$name] = $widget instanceof sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
+            $defaults[$name] = $widget instanceof \sfWidgetFormSchema ? $widget->getDefaults() : $widget->getDefault();
         }
 
         return $defaults;
@@ -150,12 +151,12 @@ public function getDefaults()
     /**
      * Adds a form formatter.
      *
-     * @param string                      $name      The formatter name
-     * @param sfWidgetFormSchemaFormatter $formatter An sfWidgetFormSchemaFormatter instance
+     * @param string                       $name      The formatter name
+     * @param \sfWidgetFormSchemaFormatter $formatter An sfWidgetFormSchemaFormatter instance
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
-    public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
+    public function addFormFormatter($name, \sfWidgetFormSchemaFormatter $formatter)
     {
         $this->formFormatters[$name] = $formatter;
 
@@ -199,7 +200,7 @@ public static function setDefaultFormFormatterName($name)
      *
      * @param string $name The form formatter name
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setFormFormatterName($name)
     {
@@ -221,9 +222,9 @@ public function getFormFormatterName()
     /**
      * Returns the form formatter to use for widget schema rendering.
      *
-     * @return sfWidgetFormSchemaFormatter sfWidgetFormSchemaFormatter instance
+     * @return \sfWidgetFormSchemaFormatter sfWidgetFormSchemaFormatter instance
      *
-     * @throws InvalidArgumentException when the form formatter not exists
+     * @throws \InvalidArgumentException when the form formatter not exists
      */
     public function getFormFormatter()
     {
@@ -233,7 +234,7 @@ public function getFormFormatter()
             $class = 'sfWidgetFormSchemaFormatter'.ucfirst($name);
 
             if (!class_exists($class)) {
-                throw new InvalidArgumentException(sprintf('The form formatter "%s" does not exist.', $name));
+                throw new \InvalidArgumentException(sprintf('The form formatter "%s" does not exist.', $name));
             }
 
             $this->formFormatters[$name] = new $class($this);
@@ -258,14 +259,14 @@ public function getFormFormatter()
      *
      * @param string $format The format string (must contain a %s for the name placeholder)
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      *
-     * @throws InvalidArgumentException when no %s exists in the format
+     * @throws \InvalidArgumentException when no %s exists in the format
      */
     public function setNameFormat($format)
     {
-        if (false !== $format && false === strpos($format, '%s')) {
-            throw new InvalidArgumentException(sprintf('The name format must contain %%s ("%s" given)', $format));
+        if (false !== $format &&   !str_contains($format, '%s')) {
+            throw new \InvalidArgumentException(sprintf('The name format must contain %%s ("%s" given)', $format));
         }
 
         $this->options['name_format'] = $format;
@@ -288,7 +289,7 @@ public function getNameFormat()
      *
      * @param array $labels An array of label names
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setLabels(array $labels)
     {
@@ -308,7 +309,7 @@ public function setLabels(array $labels)
      */
     public function getLabels()
     {
-        $labels = array();
+        $labels = [];
 
         foreach ($this->fields as $name => $widget) {
             $labels[$name] = $widget->getLabel();
@@ -323,15 +324,15 @@ public function getLabels()
      * @param string $name  The field name
      * @param string $value The label name (required - the default value is here because PHP do not allow signature changes with inheritance)
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      *
-     * @throws InvalidArgumentException when you try to set a label on a none existing widget
+     * @throws \InvalidArgumentException when you try to set a label on a none existing widget
      */
     public function setLabel($name, $value = null)
     {
         if (2 == func_num_args()) {
             if (!isset($this->fields[$name])) {
-                throw new InvalidArgumentException(sprintf('Unable to set the label on an unexistant widget ("%s").', $name));
+                throw new \InvalidArgumentException(sprintf('Unable to set the label on an unexistant widget ("%s").', $name));
             }
 
             $this->fields[$name]->setLabel($value);
@@ -350,13 +351,13 @@ public function setLabel($name, $value = null)
      *
      * @return string The label name or an empty string if it is not defined
      *
-     * @throws InvalidArgumentException when you try to get a label for a none existing widget
+     * @throws \InvalidArgumentException when you try to get a label for a none existing widget
      */
     public function getLabel($name = null)
     {
         if (1 == func_num_args()) {
             if (!isset($this->fields[$name])) {
-                throw new InvalidArgumentException(sprintf('Unable to get the label on an unexistant widget ("%s").', $name));
+                throw new \InvalidArgumentException(sprintf('Unable to get the label on an unexistant widget ("%s").', $name));
             }
 
             return $this->fields[$name]->getLabel();
@@ -371,7 +372,7 @@ public function getLabel($name = null)
      *
      * @param array $helps An array of help texts
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setHelps(array $helps)
     {
@@ -396,7 +397,7 @@ public function getHelps()
      * @param string $name The field name
      * @param string $help The help text
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      */
     public function setHelp($name, $help)
     {
@@ -424,7 +425,7 @@ public function getHelp($name)
      */
     public function getStylesheets()
     {
-        $stylesheets = array();
+        $stylesheets = [];
 
         foreach ($this->fields as $field) {
             $stylesheets = array_merge($stylesheets, $field->getStylesheets());
@@ -440,7 +441,7 @@ public function getStylesheets()
      */
     public function getJavaScripts()
     {
-        $javascripts = array();
+        $javascripts = [];
 
         foreach ($this->fields as $field) {
             $javascripts = array_merge($javascripts, $field->getJavaScripts());
@@ -475,16 +476,16 @@ public function needsMultipartForm()
      *
      * @return string An HTML string representing the rendered widget
      *
-     * @throws InvalidArgumentException when the widget not exist
+     * @throws \InvalidArgumentException when the widget not exist
      */
-    public function renderField($name, $value = null, $attributes = array(), $errors = array())
+    public function renderField($name, $value = null, $attributes = [], $errors = [])
     {
         if (null === $widget = $this[$name]) {
-            throw new InvalidArgumentException(sprintf('The field named "%s" does not exist.', $name));
+            throw new \InvalidArgumentException(sprintf('The field named "%s" does not exist.', $name));
         }
 
-        if ($errors && $widget instanceof sfWidgetFormSchema && !$errors instanceof sfValidatorErrorSchema) {
-            $schema = new sfValidatorErrorSchema($errors->getValidator());
+        if ($errors && $widget instanceof \sfWidgetFormSchema && !$errors instanceof \sfValidatorErrorSchema) {
+            $schema = new \sfValidatorErrorSchema($errors->getValidator());
             $schema->addError($errors);
             $errors = $schema;
         }
@@ -506,39 +507,39 @@ public function renderField($name, $value = null, $attributes = array(), $errors
      *
      * @return string An HTML representation of the widget
      *
-     * @throws InvalidArgumentException when values type is not array|ArrayAccess
+     * @throws \InvalidArgumentException when values type is not array|ArrayAccess
      */
-    public function render($name, $values = array(), $attributes = array(), $errors = array())
+    public function render($name, $values = [], $attributes = [], $errors = [])
     {
         if (null === $values) {
-            $values = array();
+            $values = [];
         }
 
-        if (!is_array($values) && !$values instanceof ArrayAccess) {
-            throw new InvalidArgumentException('You must pass an array of values or an instanceof ArrayAccess to render a widget schema');
+        if (!is_array($values) && !$values instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException('You must pass an array of values or an instanceof ArrayAccess to render a widget schema');
         }
 
         $formFormat = $this->getFormFormatter();
 
-        $rows = array();
-        $hiddenRows = array();
-        $errorRows = array();
+        $rows = [];
+        $hiddenRows = [];
+        $errorRows = [];
 
         // render each field
         foreach ($this->positions as $name) {
             $widget = $this[$name];
             $value = isset($values[$name]) ? $values[$name] : null;
-            $error = isset($errors[$name]) ? $errors[$name] : array();
-            $widgetAttributes = isset($attributes[$name]) ? $attributes[$name] : array();
+            $error = isset($errors[$name]) ? $errors[$name] : [];
+            $widgetAttributes = isset($attributes[$name]) ? $attributes[$name] : [];
 
-            if ($widget instanceof sfWidgetForm && $widget->isHidden()) {
+            if ($widget instanceof \sfWidgetForm && $widget->isHidden()) {
                 $hiddenRows[] = $this->renderField($name, $value, $widgetAttributes);
             } else {
                 $field = $this->renderField($name, $value, $widgetAttributes, $error);
 
                 // don't add a label tag and errors if we embed a form schema
-                $label = $widget instanceof sfWidgetFormSchema ? $formFormat->generateLabelName($name) : $formFormat->generateLabel($name);
-                $error = $widget instanceof sfWidgetFormSchema ? array() : $error;
+                $label = $widget instanceof \sfWidgetFormSchema ? $formFormat->generateLabelName($name) : $formFormat->generateLabel($name);
+                $error = $widget instanceof \sfWidgetFormSchema ? [] : $error;
 
                 $rows[] = $formFormat->formatRow($label, $field, $error, $this->getHelp($name));
             }
@@ -547,7 +548,7 @@ public function render($name, $values = array(), $attributes = array(), $errors
         if ($rows) {
             // insert hidden fields in the last row
             for ($i = 0, $max = count($rows); $i < $max; ++$i) {
-                $rows[$i] = strtr($rows[$i], array('%hidden_fields%' => $i == $max - 1 ? implode("\n", $hiddenRows) : ''));
+                $rows[$i] = strtr($rows[$i], ['%hidden_fields%' => $i == $max - 1 ? implode("\n", $hiddenRows) : '']);
             }
         } else {
             // only hidden fields
@@ -566,7 +567,7 @@ public function render($name, $values = array(), $attributes = array(), $errors
      */
     public function getGlobalErrors($errors)
     {
-        $globalErrors = array();
+        $globalErrors = [];
 
         // global errors and errors for non existent fields
         if (null !== $errors) {
@@ -580,7 +581,7 @@ public function getGlobalErrors($errors)
         // errors for hidden fields
         foreach ($this->positions as $name) {
             /** @var sfWidgetForm[] $this */
-            if ($this[$name] instanceof sfWidgetForm && $this[$name]->isHidden()) {
+            if ($this[$name] instanceof \sfWidgetForm && $this[$name]->isHidden()) {
                 if (isset($errors[$name])) {
                     $globalErrors[$this->getFormFormatter()->generateLabelName($name)] = $errors[$name];
                 }
@@ -632,7 +633,7 @@ public function offsetExists($name)
      *
      * @param string $name The field name
      *
-     * @return sfWidget|null The sfWidget instance associated with the given name, null if it does not exist
+     * @return \sfWidget|null The sfWidget instance associated with the given name, null if it does not exist
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($name)
@@ -643,16 +644,16 @@ public function offsetGet($name)
     /**
      * Sets a field (implements the ArrayAccess interface).
      *
-     * @param string   $name   The field name
-     * @param sfWidget $widget An sfWidget instance
+     * @param string    $name   The field name
+     * @param \sfWidget $widget An sfWidget instance
      *
-     * @throws InvalidArgumentException when the field is not instance of sfWidget
+     * @throws \InvalidArgumentException when the field is not instance of sfWidget
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($name, $widget)
     {
-        if (!$widget instanceof sfWidget) {
-            throw new InvalidArgumentException('A field must be an instance of sfWidget.');
+        if (!$widget instanceof \sfWidget) {
+            throw new \InvalidArgumentException('A field must be an instance of sfWidget.');
         }
 
         if (!isset($this->fields[$name])) {
@@ -662,7 +663,7 @@ public function offsetSet($name, $widget)
         $this->fields[$name] = clone $widget;
         $this->fields[$name]->setParent($this);
 
-        if ($widget instanceof sfWidgetFormSchema) {
+        if ($widget instanceof \sfWidgetFormSchema) {
             $this->fields[$name]->setNameFormat($name.'[%s]');
         }
     }
@@ -710,9 +711,9 @@ public function getPositions()
      *
      * @param array $positions An ordered array of field names
      *
-     * @return sfWidget The current widget instance
+     * @return \sfWidget The current widget instance
      *
-     * @throws InvalidArgumentException when not all fields set in $positions
+     * @throws \InvalidArgumentException when not all fields set in $positions
      *
      * @see getPositions()
      */
@@ -722,11 +723,11 @@ public function setPositions(array $positions)
         $current = array_keys($this->fields);
 
         if ($diff = array_diff($positions, $current)) {
-            throw new InvalidArgumentException('Widget schema does not include the following field(s): '.implode(', ', $diff));
+            throw new \InvalidArgumentException('Widget schema does not include the following field(s): '.implode(', ', $diff));
         }
 
         if ($diff = array_diff($current, $positions)) {
-            throw new InvalidArgumentException('Positions array must include all fields. Missing: '.implode(', ', $diff));
+            throw new \InvalidArgumentException('Positions array must include all fields. Missing: '.implode(', ', $diff));
         }
 
         foreach ($positions as &$position) {
@@ -752,16 +753,16 @@ public function setPositions(array $positions)
      * @param string $action The action (see above for all possible actions)
      * @param string $pivot  The field name used for AFTER and BEFORE actions
      *
-     * @throws InvalidArgumentException when field not exist
-     * @throws InvalidArgumentException when relative field not exist
-     * @throws LogicException           when you try to move a field without a relative field
-     * @throws LogicException           when the $action not exist
+     * @throws \InvalidArgumentException when field not exist
+     * @throws \InvalidArgumentException when relative field not exist
+     * @throws \LogicException           when you try to move a field without a relative field
+     * @throws \LogicException           when the $action not exist
      */
     public function moveField($field, $action, $pivot = null)
     {
         $field = (string) $field;
         if (false === $fieldPosition = array_search($field, $this->positions)) {
-            throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $field));
+            throw new \InvalidArgumentException(sprintf('Field "%s" does not exist.', $field));
         }
         unset($this->positions[$fieldPosition]);
         $this->positions = array_values($this->positions);
@@ -769,47 +770,47 @@ public function moveField($field, $action, $pivot = null)
         if (null !== $pivot) {
             $pivot = (string) $pivot;
             if (false === $pivotPosition = array_search($pivot, $this->positions)) {
-                throw new InvalidArgumentException(sprintf('Field "%s" does not exist.', $pivot));
+                throw new \InvalidArgumentException(sprintf('Field "%s" does not exist.', $pivot));
             }
         }
 
         switch ($action) {
-            case sfWidgetFormSchema::FIRST:
+            case \sfWidgetFormSchema::FIRST:
                 array_unshift($this->positions, $field);
 
                 break;
 
-            case sfWidgetFormSchema::LAST:
+            case \sfWidgetFormSchema::LAST:
                 $this->positions[] = $field;
 
                 break;
 
-            case sfWidgetFormSchema::BEFORE:
+            case \sfWidgetFormSchema::BEFORE:
                 if (null === $pivot) {
-                    throw new LogicException(sprintf('Unable to move field "%s" without a relative field.', $field));
+                    throw new \LogicException(sprintf('Unable to move field "%s" without a relative field.', $field));
                 }
                 $this->positions = array_merge(
                     array_slice($this->positions, 0, $pivotPosition),
-                    array($field),
+                    [$field],
                     array_slice($this->positions, $pivotPosition)
                 );
 
                 break;
 
-            case sfWidgetFormSchema::AFTER:
+            case \sfWidgetFormSchema::AFTER:
                 if (null === $pivot) {
-                    throw new LogicException(sprintf('Unable to move field "%s" without a relative field.', $field));
+                    throw new \LogicException(sprintf('Unable to move field "%s" without a relative field.', $field));
                 }
                 $this->positions = array_merge(
                     array_slice($this->positions, 0, $pivotPosition + 1),
-                    array($field),
+                    [$field],
                     array_slice($this->positions, $pivotPosition + 1)
                 );
 
                 break;
 
             default:
-                throw new LogicException(sprintf('Unknown move operation for field "%s".', $field));
+                throw new \LogicException(sprintf('Unknown move operation for field "%s".', $field));
         }
     }
 }
diff --git a/lib/widget/sfWidgetFormSchemaDecorator.class.php b/lib/widget/sfWidgetFormSchemaDecorator.class.php
index 3a01e96a7..640b44c5f 100644
--- a/lib/widget/sfWidgetFormSchemaDecorator.class.php
+++ b/lib/widget/sfWidgetFormSchemaDecorator.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSchemaDecorator extends sfWidgetFormSchema
+class sfWidgetFormSchemaDecorator extends \sfWidgetFormSchema
 {
     protected $widget;
     protected $decorator = '';
@@ -23,12 +24,12 @@ class sfWidgetFormSchemaDecorator extends sfWidgetFormSchema
     /**
      * Constructor.
      *
-     * @param sfWidgetFormSchema $widget    A sfWidgetFormSchema instance
-     * @param string             $decorator A decorator string
+     * @param \sfWidgetFormSchema $widget    A sfWidgetFormSchema instance
+     * @param string              $decorator A decorator string
      *
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
-    public function __construct(sfWidgetFormSchema $widget, $decorator)
+    public function __construct(\sfWidgetFormSchema $widget, $decorator)
     {
         $this->widget = $widget;
         $this->decorator = $decorator;
@@ -44,7 +45,7 @@ public function __clone()
     /**
      * Returns the decorated widget.
      *
-     * @return sfWidget The decorated widget
+     * @return \sfWidget The decorated widget
      */
     public function getWidget()
     {
@@ -59,19 +60,19 @@ public function getWidget()
      * @param array  $attributes An array of HTML attributes to be merged with the default HTML attributes
      * @param array  $errors     An array of errors for the field
      *
-     * @see sfWidget
+     * @see \sfWidget
      *
      * @return string
      */
-    public function render($name, $values = array(), $attributes = array(), $errors = array())
+    public function render($name, $values = [], $attributes = [], $errors = [])
     {
-        return strtr($this->decorator, array('%content%' => $this->widget->render($name, $values, $attributes, $errors)));
+        return strtr($this->decorator, ['%content%' => $this->widget->render($name, $values, $attributes, $errors)]);
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
-    public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
+    public function addFormFormatter($name, \sfWidgetFormSchemaFormatter $formatter)
     {
         $this->widget->addFormFormatter($name, $formatter);
 
@@ -79,7 +80,7 @@ public function addFormFormatter($name, sfWidgetFormSchemaFormatter $formatter)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getFormFormatters()
     {
@@ -87,7 +88,7 @@ public function getFormFormatters()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function setFormFormatterName($name)
     {
@@ -97,7 +98,7 @@ public function setFormFormatterName($name)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getFormFormatterName()
     {
@@ -105,7 +106,7 @@ public function getFormFormatterName()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getFormFormatter()
     {
@@ -113,7 +114,7 @@ public function getFormFormatter()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function setNameFormat($format)
     {
@@ -123,7 +124,7 @@ public function setNameFormat($format)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getNameFormat()
     {
@@ -131,7 +132,7 @@ public function getNameFormat()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function setLabels(array $labels)
     {
@@ -141,7 +142,7 @@ public function setLabels(array $labels)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getLabels()
     {
@@ -149,9 +150,9 @@ public function getLabels()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      *
-     * @param mixed|null $value
+     * @param \mixed|null $value
      */
     public function setLabel($name, $value = null)
     {
@@ -165,9 +166,9 @@ public function setLabel($name, $value = null)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      *
-     * @param mixed|null $name
+     * @param \mixed|null $name
      */
     public function getLabel($name = null)
     {
@@ -175,7 +176,7 @@ public function getLabel($name = null)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function setHelps(array $helps)
     {
@@ -185,7 +186,7 @@ public function setHelps(array $helps)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getHelps()
     {
@@ -193,7 +194,7 @@ public function getHelps()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function setHelp($name, $help)
     {
@@ -203,7 +204,7 @@ public function setHelp($name, $help)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getHelp($name)
     {
@@ -231,7 +232,7 @@ public function getJavaScripts()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function needsMultipartForm()
     {
@@ -239,17 +240,17 @@ public function needsMultipartForm()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      *
-     * @param mixed|null $value
+     * @param \mixed|null $value
      */
-    public function renderField($name, $value = null, $attributes = array(), $errors = array())
+    public function renderField($name, $value = null, $attributes = [], $errors = [])
     {
         return $this->widget->renderField($name, $value, $attributes, $errors);
     }
 
     /**
-     * @see sfWidgetFormSchemaFormatter
+     * @see \sfWidgetFormSchemaFormatter
      */
     public function generateLabel($name)
     {
@@ -257,7 +258,7 @@ public function generateLabel($name)
     }
 
     /**
-     * @see sfWidgetFormSchemaFormatter
+     * @see \sfWidgetFormSchemaFormatter
      */
     public function generateLabelName($name)
     {
@@ -265,7 +266,7 @@ public function generateLabelName($name)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function generateName($name)
     {
@@ -273,7 +274,7 @@ public function generateName($name)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getParent()
     {
@@ -281,9 +282,9 @@ public function getParent()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
-    public function setParent(sfWidgetFormSchema $parent = null)
+    public function setParent(\sfWidgetFormSchema $parent = null)
     {
         $this->widget->setParent($parent);
 
@@ -291,7 +292,7 @@ public function setParent(sfWidgetFormSchema $parent = null)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getFields()
     {
@@ -299,7 +300,7 @@ public function getFields()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function getPositions()
     {
@@ -307,7 +308,7 @@ public function getPositions()
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     public function setPositions(array $positions)
     {
@@ -317,9 +318,9 @@ public function setPositions(array $positions)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      *
-     * @param mixed|null $pivot
+     * @param \mixed|null $pivot
      */
     public function moveField($field, $action, $pivot = null)
     {
@@ -327,7 +328,7 @@ public function moveField($field, $action, $pivot = null)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     #[\ReturnTypeWillChange]
     public function offsetExists($name)
@@ -336,7 +337,7 @@ public function offsetExists($name)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($name)
@@ -345,7 +346,7 @@ public function offsetGet($name)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($name, $widget)
@@ -354,7 +355,7 @@ public function offsetSet($name, $widget)
     }
 
     /**
-     * @see sfWidgetFormSchema
+     * @see \sfWidgetFormSchema
      */
     #[\ReturnTypeWillChange]
     public function offsetUnset($name)
diff --git a/lib/widget/sfWidgetFormSchemaFormatter.class.php b/lib/widget/sfWidgetFormSchemaFormatter.class.php
index 863e0e3be..f397164e4 100644
--- a/lib/widget/sfWidgetFormSchemaFormatter.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatter.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -32,20 +33,20 @@ abstract class sfWidgetFormSchemaFormatter
     /**
      * Constructor.
      */
-    public function __construct(sfWidgetFormSchema $widgetSchema)
+    public function __construct(\sfWidgetFormSchema $widgetSchema)
     {
         $this->setWidgetSchema($widgetSchema);
     }
 
-    public function formatRow($label, $field, $errors = array(), $help = '', $hiddenFields = null)
+    public function formatRow($label, $field, $errors = [], $help = '', $hiddenFields = null)
     {
-        return strtr($this->getRowFormat(), array(
+        return strtr($this->getRowFormat(), [
             '%label%' => $label,
             '%field%' => $field,
             '%error%' => $this->formatErrorsForRow($errors),
             '%help%' => $this->formatHelp($help),
             '%hidden_fields%' => null === $hiddenFields ? '%hidden_fields%' : $hiddenFields,
-        ));
+        ]);
     }
 
     /**
@@ -56,7 +57,7 @@ public function formatRow($label, $field, $errors = array(), $help = '', $hidden
      *
      * @return string
      */
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         if (false === $subject) {
             return false;
@@ -75,7 +76,7 @@ public function translate($subject, $parameters = array())
 
         $catalogue = $this->getTranslationCatalogue();
 
-        if (self::$translationCallable instanceof sfCallable) {
+        if (self::$translationCallable instanceof \sfCallable) {
             return self::$translationCallable->call($subject, $parameters, $catalogue);
         }
 
@@ -93,12 +94,12 @@ public static function getTranslationCallable()
     /**
      * Sets a callable which aims to translate form labels, errors and help messages.
      *
-     * @throws InvalidArgumentException if an invalid php callable or sfCallable has been provided
+     * @throws \InvalidArgumentException if an invalid php callable or sfCallable has been provided
      */
     public static function setTranslationCallable($callable)
     {
-        if (!$callable instanceof sfCallable && !is_callable($callable)) {
-            throw new InvalidArgumentException('Provided i18n callable should be either an instance of sfCallable or a valid PHP callable');
+        if (!$callable instanceof \sfCallable && !is_callable($callable)) {
+            throw new \InvalidArgumentException('Provided i18n callable should be either an instance of sfCallable or a valid PHP callable');
         }
 
         self::$translationCallable = $callable;
@@ -110,7 +111,7 @@ public function formatHelp($help)
             return '';
         }
 
-        return strtr($this->getHelpFormat(), array('%help%' => $this->translate($help)));
+        return strtr($this->getHelpFormat(), ['%help%' => $this->translate($help)]);
     }
 
     public function formatErrorRow($errors)
@@ -119,7 +120,7 @@ public function formatErrorRow($errors)
             return '';
         }
 
-        return strtr($this->getErrorRowFormat(), array('%errors%' => $this->formatErrorsForRow($errors)));
+        return strtr($this->getErrorRowFormat(), ['%errors%' => $this->formatErrorsForRow($errors)]);
     }
 
     public function formatErrorsForRow($errors)
@@ -129,10 +130,10 @@ public function formatErrorsForRow($errors)
         }
 
         if (!is_array($errors)) {
-            $errors = array($errors);
+            $errors = [$errors];
         }
 
-        return strtr($this->getErrorListFormatInARow(), array('%errors%' => implode('', $this->unnestErrors($errors))));
+        return strtr($this->getErrorListFormatInARow(), ['%errors%' => implode('', $this->unnestErrors($errors))]);
     }
 
     /**
@@ -143,7 +144,7 @@ public function formatErrorsForRow($errors)
      *
      * @return string The label tag
      */
-    public function generateLabel($name, $attributes = array())
+    public function generateLabel($name, $attributes = [])
     {
         $labelName = $this->generateLabelName($name);
 
@@ -191,12 +192,12 @@ public function getTranslationCatalogue()
      *
      * @param string $catalogue
      *
-     * @throws InvalidArgumentException when the catalogue is not a string
+     * @throws \InvalidArgumentException when the catalogue is not a string
      */
     public function setTranslationCatalogue($catalogue)
     {
         if (!is_string($catalogue)) {
-            throw new InvalidArgumentException('Catalogue name must be a string');
+            throw new \InvalidArgumentException('Catalogue name must be a string');
         }
 
         $this->translationCatalogue = $catalogue;
@@ -275,9 +276,9 @@ public function getHelpFormat()
     /**
      * Sets the widget schema associated with this formatter instance.
      *
-     * @param sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
+     * @param \sfWidgetFormSchema $widgetSchema A sfWidgetFormSchema instance
      */
-    public function setWidgetSchema(sfWidgetFormSchema $widgetSchema)
+    public function setWidgetSchema(\sfWidgetFormSchema $widgetSchema)
     {
         $this->widgetSchema = $widgetSchema;
     }
@@ -289,22 +290,22 @@ public function getWidgetSchema()
 
     protected function unnestErrors($errors, $prefix = '')
     {
-        $newErrors = array();
+        $newErrors = [];
 
         foreach ($errors as $name => $error) {
-            if ($error instanceof ArrayAccess || is_array($error)) {
+            if ($error instanceof \ArrayAccess || is_array($error)) {
                 $newErrors = array_merge($newErrors, $this->unnestErrors($error, ($prefix ? $prefix.' > ' : '').$name));
             } else {
-                if ($error instanceof sfValidatorError) {
+                if ($error instanceof \sfValidatorError) {
                     $err = $this->translate($error->getMessageFormat(), $error->getArguments());
                 } else {
                     $err = $this->translate($error);
                 }
 
                 if (!is_int($name)) {
-                    $newErrors[] = strtr($this->getNamedErrorRowFormatInARow(), array('%error%' => $err, '%name%' => ($prefix ? $prefix.' > ' : '').$name));
+                    $newErrors[] = strtr($this->getNamedErrorRowFormatInARow(), ['%error%' => $err, '%name%' => ($prefix ? $prefix.' > ' : '').$name]);
                 } else {
-                    $newErrors[] = strtr($this->getErrorRowFormatInARow(), array('%error%' => $err));
+                    $newErrors[] = strtr($this->getErrorRowFormatInARow(), ['%error%' => $err]);
                 }
             }
         }
diff --git a/lib/widget/sfWidgetFormSchemaFormatterList.class.php b/lib/widget/sfWidgetFormSchemaFormatterList.class.php
index 7e768037e..534aa8b74 100644
--- a/lib/widget/sfWidgetFormSchemaFormatterList.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatterList.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSchemaFormatterList extends sfWidgetFormSchemaFormatter
+class sfWidgetFormSchemaFormatterList extends \sfWidgetFormSchemaFormatter
 {
     protected $rowFormat = "<li>\n  %error%%label%\n  %field%%help%\n%hidden_fields%</li>\n";
     protected $errorRowFormat = "<li>\n%errors%</li>\n";
diff --git a/lib/widget/sfWidgetFormSchemaFormatterTable.class.php b/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
index e0db9ae4f..729710805 100644
--- a/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
+++ b/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSchemaFormatterTable extends sfWidgetFormSchemaFormatter
+class sfWidgetFormSchemaFormatterTable extends \sfWidgetFormSchemaFormatter
 {
     protected $rowFormat = "<tr>\n  <th>%label%</th>\n  <td>%error%%field%%help%%hidden_fields%</td>\n</tr>\n";
     protected $errorRowFormat = "<tr><td colspan=\"2\">\n%errors%</td></tr>\n";
diff --git a/lib/widget/sfWidgetFormSelect.class.php b/lib/widget/sfWidgetFormSelect.class.php
index 6f58a5cb6..c8caad53c 100644
--- a/lib/widget/sfWidgetFormSelect.class.php
+++ b/lib/widget/sfWidgetFormSelect.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSelect extends sfWidgetFormChoiceBase
+class sfWidgetFormSelect extends \sfWidgetFormChoiceBase
 {
     /**
      * Renders the widget.
@@ -27,9 +28,9 @@ class sfWidgetFormSelect extends sfWidgetFormChoiceBase
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         if ($this->getOption('multiple')) {
             $attributes['multiple'] = 'multiple';
@@ -41,7 +42,7 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
 
         $choices = $this->getChoices();
 
-        return $this->renderContentTag('select', "\n".implode("\n", $this->getOptionsForSelect($value, $choices))."\n", array_merge(array('name' => $name), $attributes));
+        return $this->renderContentTag('select', "\n".implode("\n", $this->getOptionsForSelect($value, $choices))."\n", array_merge(['name' => $name], $attributes));
     }
 
     /**
@@ -55,9 +56,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoiceBase
+     * @see \sfWidgetFormChoiceBase
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
@@ -75,23 +76,23 @@ protected function configure($options = array(), $attributes = array())
     protected function getOptionsForSelect($value, $choices)
     {
         $mainAttributes = $this->attributes;
-        $this->attributes = array();
+        $this->attributes = [];
 
         if (!is_array($value)) {
-            $value = array($value);
+            $value = [$value];
         }
 
-        $value_set = array();
+        $value_set = [];
         foreach ($value as $v) {
             $value_set[(string) $v] = true;
         }
 
-        $options = array();
+        $options = [];
         foreach ($choices as $key => $option) {
             if (is_array($option)) {
-                $options[] = $this->renderContentTag('optgroup', implode("\n", $this->getOptionsForSelect($value, $option)), array('label' => self::escapeOnce($key)));
+                $options[] = $this->renderContentTag('optgroup', implode("\n", $this->getOptionsForSelect($value, $option)), ['label' => self::escapeOnce($key)]);
             } else {
-                $attributes = array('value' => self::escapeOnce($key));
+                $attributes = ['value' => self::escapeOnce($key)];
                 if (isset($value_set[(string) $key])) {
                     $attributes['selected'] = 'selected';
                 }
diff --git a/lib/widget/sfWidgetFormSelectCheckbox.class.php b/lib/widget/sfWidgetFormSelectCheckbox.class.php
index 7294e307e..411144a11 100644
--- a/lib/widget/sfWidgetFormSelectCheckbox.class.php
+++ b/lib/widget/sfWidgetFormSelectCheckbox.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSelectCheckbox extends sfWidgetFormChoiceBase
+class sfWidgetFormSelectCheckbox extends \sfWidgetFormChoiceBase
 {
     /**
      * Renders the widget.
@@ -27,25 +28,25 @@ class sfWidgetFormSelectCheckbox extends sfWidgetFormChoiceBase
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         if ('[]' != substr($name, -2)) {
             $name .= '[]';
         }
 
         if (null === $value) {
-            $value = array();
+            $value = [];
         }
 
         $choices = $this->getChoices();
 
         // with groups?
         if (count($choices) && is_array(current($choices))) {
-            $parts = array();
+            $parts = [];
             foreach ($choices as $key => $option) {
-                $parts[] = strtr($this->getOption('template'), array('%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)));
+                $parts[] = strtr($this->getOption('template'), ['%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)]);
             }
 
             return implode("\n", $parts);
@@ -56,12 +57,12 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
 
     public function formatter($widget, $inputs)
     {
-        $rows = array();
+        $rows = [];
         foreach ($inputs as $input) {
             $rows[] = $this->renderContentTag('li', $input['input'].$this->getOption('label_separator').$input['label']);
         }
 
-        return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), array('class' => $this->getOption('class')));
+        return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), ['class' => $this->getOption('class')]);
     }
 
     /**
@@ -80,38 +81,38 @@ public function formatter($widget, $inputs)
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoiceBase
+     * @see \sfWidgetFormChoiceBase
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
         $this->addOption('class', 'checkbox_list');
         $this->addOption('label_separator', '&nbsp;');
         $this->addOption('separator', "\n");
-        $this->addOption('formatter', array($this, 'formatter'));
+        $this->addOption('formatter', [$this, 'formatter']);
         $this->addOption('template', '%group% %options%');
     }
 
     protected function formatChoices($name, $value, $choices, $attributes)
     {
-        $inputs = array();
+        $inputs = [];
         foreach ($choices as $key => $option) {
-            $baseAttributes = array(
+            $baseAttributes = [
                 'name' => $name,
                 'type' => 'checkbox',
                 'value' => self::escapeOnce($key),
                 'id' => $id = $this->generateId($name, self::escapeOnce($key)),
-            );
+            ];
 
             if ((is_array($value) && in_array((string) $key, $value)) || (is_string($value) && (string) $key == (string) $value)) {
                 $baseAttributes['checked'] = 'checked';
             }
 
-            $inputs[$id] = array(
+            $inputs[$id] = [
                 'input' => $this->renderTag('input', array_merge($baseAttributes, $attributes)),
-                'label' => $this->renderContentTag('label', self::escapeOnce($option), array('for' => $id)),
-            );
+                'label' => $this->renderContentTag('label', self::escapeOnce($option), ['for' => $id]),
+            ];
         }
 
         return call_user_func($this->getOption('formatter'), $this, $inputs);
diff --git a/lib/widget/sfWidgetFormSelectMany.class.php b/lib/widget/sfWidgetFormSelectMany.class.php
index b9515fb1b..dd396612c 100644
--- a/lib/widget/sfWidgetFormSelectMany.class.php
+++ b/lib/widget/sfWidgetFormSelectMany.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSelectMany extends sfWidgetFormSelect
+class sfWidgetFormSelectMany extends \sfWidgetFormSelect
 {
     /**
      * Configures the current widget.
@@ -23,9 +24,9 @@ class sfWidgetFormSelectMany extends sfWidgetFormSelect
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormSelect
+     * @see \sfWidgetFormSelect
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
diff --git a/lib/widget/sfWidgetFormSelectRadio.class.php b/lib/widget/sfWidgetFormSelectRadio.class.php
index 6df7bccc2..405d34787 100644
--- a/lib/widget/sfWidgetFormSelectRadio.class.php
+++ b/lib/widget/sfWidgetFormSelectRadio.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormSelectRadio extends sfWidgetFormChoiceBase
+class sfWidgetFormSelectRadio extends \sfWidgetFormChoiceBase
 {
     /**
      * Renders the widget.
@@ -27,9 +28,9 @@ class sfWidgetFormSelectRadio extends sfWidgetFormChoiceBase
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         if ('[]' != substr($name, -2)) {
             $name .= '[]';
@@ -39,9 +40,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
 
         // with groups?
         if (count($choices) && is_array(next($choices))) {
-            $parts = array();
+            $parts = [];
             foreach ($choices as $key => $option) {
-                $parts[] = strtr($this->getOption('template'), array('%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)));
+                $parts[] = strtr($this->getOption('template'), ['%group%' => $key, '%options%' => $this->formatChoices($name, $value, $option, $attributes)]);
             }
 
             return implode("\n", $parts);
@@ -52,12 +53,12 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
 
     public function formatter($widget, $inputs)
     {
-        $rows = array();
+        $rows = [];
         foreach ($inputs as $input) {
             $rows[] = $this->renderContentTag('li', $input['input'].$this->getOption('label_separator').$input['label']);
         }
 
-        return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), array('class' => $this->getOption('class')));
+        return !$rows ? '' : $this->renderContentTag('ul', implode($this->getOption('separator'), $rows), ['class' => $this->getOption('class')]);
     }
 
     /**
@@ -76,38 +77,38 @@ public function formatter($widget, $inputs)
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetFormChoiceBase
+     * @see \sfWidgetFormChoiceBase
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         parent::configure($options, $attributes);
 
         $this->addOption('class', 'radio_list');
         $this->addOption('label_separator', '&nbsp;');
         $this->addOption('separator', "\n");
-        $this->addOption('formatter', array($this, 'formatter'));
+        $this->addOption('formatter', [$this, 'formatter']);
         $this->addOption('template', '%group% %options%');
     }
 
     protected function formatChoices($name, $value, $choices, $attributes)
     {
-        $inputs = array();
+        $inputs = [];
         foreach ($choices as $key => $option) {
-            $baseAttributes = array(
+            $baseAttributes = [
                 'name' => substr($name, 0, -2),
                 'type' => 'radio',
                 'value' => self::escapeOnce($key),
                 'id' => $id = $this->generateId($name, self::escapeOnce($key)),
-            );
+            ];
 
             if ((string) $key == (string) (false === $value ? 0 : $value)) {
                 $baseAttributes['checked'] = 'checked';
             }
 
-            $inputs[$id] = array(
+            $inputs[$id] = [
                 'input' => $this->renderTag('input', array_merge($baseAttributes, $attributes)),
-                'label' => $this->renderContentTag('label', self::escapeOnce($option), array('for' => $id)),
-            );
+                'label' => $this->renderContentTag('label', self::escapeOnce($option), ['for' => $id]),
+            ];
         }
 
         return call_user_func($this->getOption('formatter'), $this, $inputs);
diff --git a/lib/widget/sfWidgetFormTextarea.class.php b/lib/widget/sfWidgetFormTextarea.class.php
index 088f8772e..ea98d79a0 100644
--- a/lib/widget/sfWidgetFormTextarea.class.php
+++ b/lib/widget/sfWidgetFormTextarea.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormTextarea extends sfWidgetForm
+class sfWidgetFormTextarea extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,11 +28,11 @@ class sfWidgetFormTextarea extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
-        return $this->renderContentTag('textarea', self::escapeOnce($value), array_merge(array('name' => $name), $attributes));
+        return $this->renderContentTag('textarea', self::escapeOnce($value), array_merge(['name' => $name], $attributes));
     }
 
     /**
@@ -40,9 +41,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->setAttribute('rows', 4);
         $this->setAttribute('cols', 30);
diff --git a/lib/widget/sfWidgetFormTime.class.php b/lib/widget/sfWidgetFormTime.class.php
index f866f1f92..b02268fbb 100644
--- a/lib/widget/sfWidgetFormTime.class.php
+++ b/lib/widget/sfWidgetFormTime.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfWidgetFormTime extends sfWidgetForm
+class sfWidgetFormTime extends \sfWidgetForm
 {
     /**
      * Renders the widget.
@@ -27,12 +28,12 @@ class sfWidgetFormTime extends sfWidgetForm
      *
      * @return string An HTML tag string
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         // convert value to an array
-        $default = array('hour' => null, 'minute' => null, 'second' => null);
+        $default = ['hour' => null, 'minute' => null, 'second' => null];
         if (is_array($value)) {
             $value = array_merge($default, $value);
         } else {
@@ -41,24 +42,24 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
                 $value = $default;
             } else {
                 // int cast required to get rid of leading zeros
-                $value = array('hour' => (int) date('H', $value), 'minute' => (int) date('i', $value), 'second' => (int) date('s', $value));
+                $value = ['hour' => (int) date('H', $value), 'minute' => (int) date('i', $value), 'second' => (int) date('s', $value)];
             }
         }
 
-        $time = array();
+        $time = [];
         $emptyValues = $this->getOption('empty_values');
 
         // hours
-        $widget = new sfWidgetFormSelect(array('choices' => $this->getOption('can_be_empty') ? array('' => $emptyValues['hour']) + $this->getOption('hours') : $this->getOption('hours'), 'id_format' => $this->getOption('id_format')), array_merge($this->attributes, $attributes));
+        $widget = new \sfWidgetFormSelect(['choices' => $this->getOption('can_be_empty') ? ['' => $emptyValues['hour']] + $this->getOption('hours') : $this->getOption('hours'), 'id_format' => $this->getOption('id_format')], array_merge($this->attributes, $attributes));
         $time['%hour%'] = $widget->render($name.'[hour]', $value['hour']);
 
         // minutes
-        $widget = new sfWidgetFormSelect(array('choices' => $this->getOption('can_be_empty') ? array('' => $emptyValues['minute']) + $this->getOption('minutes') : $this->getOption('minutes'), 'id_format' => $this->getOption('id_format')), array_merge($this->attributes, $attributes));
+        $widget = new \sfWidgetFormSelect(['choices' => $this->getOption('can_be_empty') ? ['' => $emptyValues['minute']] + $this->getOption('minutes') : $this->getOption('minutes'), 'id_format' => $this->getOption('id_format')], array_merge($this->attributes, $attributes));
         $time['%minute%'] = $widget->render($name.'[minute]', $value['minute']);
 
         if ($this->getOption('with_seconds')) {
             // seconds
-            $widget = new sfWidgetFormSelect(array('choices' => $this->getOption('can_be_empty') ? array('' => $emptyValues['second']) + $this->getOption('seconds') : $this->getOption('seconds'), 'id_format' => $this->getOption('id_format')), array_merge($this->attributes, $attributes));
+            $widget = new \sfWidgetFormSelect(['choices' => $this->getOption('can_be_empty') ? ['' => $emptyValues['second']] + $this->getOption('seconds') : $this->getOption('seconds'), 'id_format' => $this->getOption('id_format')], array_merge($this->attributes, $attributes));
             $time['%second%'] = $widget->render($name.'[second]', $value['second']);
         }
 
@@ -82,9 +83,9 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
      * @param array $options    An array of options
      * @param array $attributes An array of default HTML attributes
      *
-     * @see sfWidgetForm
+     * @see \sfWidgetForm
      */
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addOption('format', '%hour%:%minute%:%second%');
         $this->addOption('format_without_seconds', '%hour%:%minute%');
@@ -94,6 +95,6 @@ protected function configure($options = array(), $attributes = array())
         $this->addOption('seconds', parent::generateTwoCharsRange(0, 59));
 
         $this->addOption('can_be_empty', true);
-        $this->addOption('empty_values', array('hour' => '', 'minute' => '', 'second' => ''));
+        $this->addOption('empty_values', ['hour' => '', 'minute' => '', 'second' => '']);
     }
 }
diff --git a/lib/yaml/sfYaml.class.php b/lib/yaml/sfYaml.class.php
index e5246c1fe..41cb30bc1 100644
--- a/lib/yaml/sfYaml.class.php
+++ b/lib/yaml/sfYaml.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,8 +27,8 @@ class sfYaml
      */
     public static function setSpecVersion($version)
     {
-        if (!in_array($version, array('1.1', '1.2'))) {
-            throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
+        if (!in_array($version, ['1.1', '1.2'])) {
+            throw new \InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
         }
 
         self::$spec = $version;
@@ -59,14 +60,14 @@ public static function getSpecVersion()
      *
      * @return array The YAML converted to a PHP array
      *
-     * @throws InvalidArgumentException If the YAML is not valid
+     * @throws \InvalidArgumentException If the YAML is not valid
      */
     public static function load($input, $encoding = 'UTF-8')
     {
         $file = '';
 
         // if input is a file, process it
-        if (false === strpos($input, "\n") && is_file($input)) {
+        if (!str_contains($input, "\n") && is_file($input)) {
             $file = $input;
 
             ob_start();
@@ -89,12 +90,12 @@ public static function load($input, $encoding = 'UTF-8')
             $mbConvertEncoding = true;
         }
 
-        $yaml = new sfYamlParser();
+        $yaml = new \sfYamlParser();
 
         try {
             $ret = $yaml->parse($input);
-        } catch (Exception $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
+        } catch (\Exception $e) {
+            throw new \InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
         }
 
         if ($ret && $mbConvertEncoding) {
@@ -117,7 +118,7 @@ public static function load($input, $encoding = 'UTF-8')
      */
     public static function dump($array, $inline = 2)
     {
-        $yaml = new sfYamlDumper();
+        $yaml = new \sfYamlDumper();
 
         return $yaml->dump($array, $inline);
     }
@@ -132,7 +133,7 @@ public static function dump($array, $inline = 2)
      */
     protected static function arrayConvertEncoding(array $result, $encoding)
     {
-        $convertedResult = array();
+        $convertedResult = [];
         foreach ($result as $key => $value) {
             if (is_string($key)) {
                 $key = mb_convert_encoding($key, $encoding, 'UTF-8');
diff --git a/lib/yaml/sfYamlDumper.class.php b/lib/yaml/sfYamlDumper.class.php
index 4c37d7648..02623391c 100644
--- a/lib/yaml/sfYamlDumper.class.php
+++ b/lib/yaml/sfYamlDumper.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -32,7 +33,7 @@ public function dump($input, $inline = 0, $indent = 0)
         $prefix = $indent ? str_repeat(' ', $indent) : '';
 
         if ($inline <= 0 || !is_array($input) || empty($input)) {
-            $output .= $prefix.sfYamlInline::dump($input);
+            $output .= $prefix.\sfYamlInline::dump($input);
         } else {
             $isAHash = array_keys($input) !== range(0, count($input) - 1);
 
@@ -42,7 +43,7 @@ public function dump($input, $inline = 0, $indent = 0)
                 $output .= sprintf(
                     '%s%s%s%s',
                     $prefix,
-                    $isAHash ? sfYamlInline::dump($key).':' : '-',
+                    $isAHash ? \sfYamlInline::dump($key).':' : '-',
                     $willBeInlined ? ' ' : "\n",
                     $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
                 ).($willBeInlined ? "\n" : '');
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
index d1028416f..bba8a0733 100644
--- a/lib/yaml/sfYamlInline.class.php
+++ b/lib/yaml/sfYamlInline.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -70,12 +71,12 @@ public static function load($value)
      */
     public static function dump($value)
     {
-        if ('1.1' === sfYaml::getSpecVersion()) {
-            $trueValues = array('true', 'on', '+', 'yes', 'y');
-            $falseValues = array('false', 'off', '-', 'no', 'n');
+        if ('1.1' === \sfYaml::getSpecVersion()) {
+            $trueValues = ['true', 'on', '+', 'yes', 'y'];
+            $falseValues = ['false', 'off', '-', 'no', 'n'];
         } else {
-            $trueValues = array('true');
-            $falseValues = array('false');
+            $trueValues = ['true'];
+            $falseValues = ['false'];
         }
 
         switch (true) {
@@ -103,8 +104,8 @@ public static function dump($value)
             case is_numeric($value) && false === strpbrk($value, "\f\n\r\t\v"):
                 return is_infinite($value) ? str_ireplace('INF', '.Inf', (string) $value) : (is_string($value) ? "'{$value}'" : $value);
 
-            case false !== strpos($value, "\n") || false !== strpos($value, "\r"):
-                return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value));
+            case str_contains($value, "\n") ||   str_contains($value, "\r"):
+                return sprintf('"%s"', str_replace(['"', "\n", "\r"], ['\\"', '\n', '\r'], $value));
 
             case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
                 return sprintf("'%s'", str_replace('\'', '\'\'', $value));
@@ -121,7 +122,7 @@ public static function dump($value)
             case in_array(strtolower($value), $falseValues):
                 return "'{$value}'";
 
-            case in_array(strtolower($value), array('null', '~')):
+            case in_array(strtolower($value), ['null', '~']):
                 return "'{$value}'";
 
             default:
@@ -132,14 +133,14 @@ public static function dump($value)
     /**
      * Parses a scalar to a YAML string.
      *
-     * @param scalar $scalar
-     * @param string $delimiters
-     * @param int    $i
-     * @param bool   $evaluate
+     * @param \scalar $scalar
+     * @param string  $delimiters
+     * @param int     $i
+     * @param bool    $evaluate
      *
      * @return string A YAML string
      */
-    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
+    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = ['"', "'"], &$i = 0, $evaluate = true)
     {
         if (is_string($scalar) && in_array($scalar[$i], $stringDelimiters)) {
             // quoted scalar
@@ -158,7 +159,7 @@ public static function parseScalar($scalar, $delimiters = null, $stringDelimiter
                 $output = $match[1];
                 $i += strlen($output);
             } else {
-                throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
+                throw new \InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
             }
 
             $output = $evaluate ? self::evaluateScalar($output) : $output;
@@ -181,7 +182,7 @@ protected static function dumpArray($value)
         if (
             (1 == count($keys) && '0' == $keys[0])
             || (count($keys) > 1 && array_sum(array_map('intval', $keys)) == count($keys) * (count($keys) - 1) / 2)) {
-            $output = array();
+            $output = [];
             foreach ($value as $val) {
                 $output[] = self::dump($val);
             }
@@ -190,7 +191,7 @@ protected static function dumpArray($value)
         }
 
         // mapping
-        $output = array();
+        $output = [];
         foreach ($value as $key => $val) {
             $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
         }
@@ -209,14 +210,14 @@ protected static function dumpArray($value)
     protected static function parseQuotedScalar($scalar, &$i)
     {
         if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
-            throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
+            throw new \InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
         }
 
         $output = substr($match[0], 1, strlen($match[0]) - 2);
 
         if ('"' == $scalar[$i]) {
             // evaluate the string
-            $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
+            $output = str_replace(['\\"', '\\n', '\\r'], ['"', "\n", "\r"], $output);
         } else {
             // unescape '
             $output = str_replace('\'\'', '\'', $output);
@@ -237,7 +238,7 @@ protected static function parseQuotedScalar($scalar, &$i)
      */
     protected static function parseSequence($sequence, &$i = 0)
     {
-        $output = array();
+        $output = [];
         $len = strlen($sequence);
         ++$i;
 
@@ -264,14 +265,14 @@ protected static function parseSequence($sequence, &$i = 0)
                     break;
 
                 default:
-                    $isQuoted = in_array($sequence[$i], array('"', "'"));
-                    $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
+                    $isQuoted = in_array($sequence[$i], ['"', "'"]);
+                    $value = self::parseScalar($sequence, [',', ']'], ['"', "'"], $i);
 
-                    if (!$isQuoted && false !== strpos((string) $value, ': ')) {
+                    if (!$isQuoted &&   str_contains((string) $value, ': ')) {
                         // embedded mapping?
                         try {
                             $value = self::parseMapping('{'.$value.'}');
-                        } catch (InvalidArgumentException $e) {
+                        } catch (\InvalidArgumentException $e) {
                             // no, it's not
                         }
                     }
@@ -284,7 +285,7 @@ protected static function parseSequence($sequence, &$i = 0)
             ++$i;
         }
 
-        throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
+        throw new \InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
     }
 
     /**
@@ -297,7 +298,7 @@ protected static function parseSequence($sequence, &$i = 0)
      */
     protected static function parseMapping($mapping, &$i = 0)
     {
-        $output = array();
+        $output = [];
         $len = strlen($mapping);
         ++$i;
 
@@ -314,7 +315,7 @@ protected static function parseMapping($mapping, &$i = 0)
             }
 
             // key
-            $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
+            $key = self::parseScalar($mapping, [':', ' '], ['"', "'"], $i, false);
 
             // value
             $done = false;
@@ -339,7 +340,7 @@ protected static function parseMapping($mapping, &$i = 0)
                         break;
 
                     default:
-                        $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i);
+                        $output[$key] = self::parseScalar($mapping, [',', '}'], ['"', "'"], $i);
                         $done = true;
                         --$i;
                 }
@@ -352,7 +353,7 @@ protected static function parseMapping($mapping, &$i = 0)
             }
         }
 
-        throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
+        throw new \InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
     }
 
     /**
@@ -366,12 +367,12 @@ protected static function evaluateScalar($scalar)
     {
         $scalar = trim($scalar);
 
-        if ('1.1' === sfYaml::getSpecVersion()) {
-            $trueValues = array('true', 'on', '+', 'yes', 'y');
-            $falseValues = array('false', 'off', '-', 'no', 'n');
+        if ('1.1' === \sfYaml::getSpecVersion()) {
+            $trueValues = ['true', 'on', '+', 'yes', 'y'];
+            $falseValues = ['false', 'off', '-', 'no', 'n'];
         } else {
-            $trueValues = array('true');
-            $falseValues = array('false');
+            $trueValues = ['true'];
+            $falseValues = ['false'];
         }
 
         switch (true) {
@@ -380,13 +381,13 @@ protected static function evaluateScalar($scalar)
             case '~' == $scalar:
                 return null;
 
-            case 0 === strpos($scalar, '!str'):
+            case str_starts_with($scalar, '!str'):
                 return (string) substr($scalar, 5);
 
-            case 0 === strpos($scalar, '! '):
+            case str_starts_with($scalar, '! '):
                 return (int) self::parseScalar(substr($scalar, 2));
 
-            case 0 === strpos($scalar, '!!php/object:'):
+            case str_starts_with($scalar, '!!php/object:'):
                 return unserialize(substr($scalar, 13));
 
             case ctype_digit($scalar):
@@ -401,7 +402,7 @@ protected static function evaluateScalar($scalar)
             case in_array(strtolower($scalar), $falseValues):
                 return false;
 
-            case 0 === strpos($scalar, '0x'):
+            case str_starts_with($scalar, '0x'):
                 return hexdec($scalar);
 
             case is_numeric($scalar):
diff --git a/lib/yaml/sfYamlParser.class.php b/lib/yaml/sfYamlParser.class.php
index c472a731f..e10dbd26b 100644
--- a/lib/yaml/sfYamlParser.class.php
+++ b/lib/yaml/sfYamlParser.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -22,10 +23,10 @@
 class sfYamlParser
 {
     protected $offset = 0;
-    protected $lines = array();
+    protected $lines = [];
     protected $currentLineNb = -1;
     protected $currentLine = '';
-    protected $refs = array();
+    protected $refs = [];
 
     /**
      * Constructor.
@@ -44,7 +45,7 @@ public function __construct($offset = 0)
      *
      * @return mixed A PHP value
      *
-     * @throws InvalidArgumentException If the YAML is not valid
+     * @throws \InvalidArgumentException If the YAML is not valid
      */
     public function parse($value)
     {
@@ -53,7 +54,7 @@ public function parse($value)
         $this->lines = explode("\n", $this->cleanup($value));
 
         if (function_exists('mb_detect_encoding') && false === mb_detect_encoding($value, 'UTF-8', true)) {
-            throw new InvalidArgumentException('The YAML value does not appear to be valid UTF-8.');
+            throw new \InvalidArgumentException('The YAML value does not appear to be valid UTF-8.');
         }
 
         if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
@@ -61,7 +62,7 @@ public function parse($value)
             mb_internal_encoding('UTF-8');
         }
 
-        $data = array();
+        $data = [];
         while ($this->moveToNextLine()) {
             if ($this->isCurrentLineEmpty()) {
                 continue;
@@ -69,7 +70,7 @@ public function parse($value)
 
             // tab?
             if (preg_match('#^\t+#', $this->currentLine)) {
-                throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                throw new \InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
             }
 
             $isRef = $isInPlace = $isProcessed = false;
@@ -80,18 +81,18 @@ public function parse($value)
                 }
 
                 // array
-                if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                if (!isset($values['value']) || '' == trim($values['value'], ' ') ||   str_starts_with(ltrim($values['value'], ' '), '#')) {
                     $c = $this->getRealCurrentLineNb() + 1;
-                    $parser = new sfYamlParser($c);
+                    $parser = new \sfYamlParser($c);
                     $parser->refs = &$this->refs;
                     $data[] = $parser->parse($this->getNextEmbedBlock());
                 } else {
                     if (isset($values['leadspaces'])
                       && ' ' == $values['leadspaces']
-                      && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)) {
+                      && preg_match('#^(?P<key>'.\sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)) {
                         // this is a compact notation element, add to next block and parse
                         $c = $this->getRealCurrentLineNb();
-                        $parser = new sfYamlParser($c);
+                        $parser = new \sfYamlParser($c);
                         $parser->refs = &$this->refs;
 
                         $block = $values['value'];
@@ -104,14 +105,14 @@ public function parse($value)
                         $data[] = $this->parseValue($values['value']);
                     }
                 }
-            } elseif (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
-                $key = sfYamlInline::parseScalar($values['key']);
+            } elseif (preg_match('#^(?P<key>'.\sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+                $key = \sfYamlInline::parseScalar($values['key']);
 
                 if ('<<' === $key) {
                     if (isset($values['value']) && '*' === substr($values['value'], 0, 1)) {
                         $isInPlace = substr($values['value'], 1);
                         if (!array_key_exists($isInPlace, $this->refs)) {
-                            throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                            throw new \InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
                         }
                     } else {
                         if (isset($values['value']) && '' !== $values['value']) {
@@ -120,19 +121,19 @@ public function parse($value)
                             $value = $this->getNextEmbedBlock();
                         }
                         $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new sfYamlParser($c);
+                        $parser = new \sfYamlParser($c);
                         $parser->refs = &$this->refs;
                         $parsed = $parser->parse($value);
 
-                        $merged = array();
+                        $merged = [];
                         if (!is_array($parsed)) {
-                            throw new InvalidArgumentException(sprintf('YAML merge keys used with a scalar value instead of an array at line %s (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                            throw new \InvalidArgumentException(sprintf('YAML merge keys used with a scalar value instead of an array at line %s (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
                         }
                         if (isset($parsed[0])) {
                             // Numeric array, merge individual elements
                             foreach (array_reverse($parsed) as $parsedItem) {
                                 if (!is_array($parsedItem)) {
-                                    throw new InvalidArgumentException(sprintf('Merge items must be arrays at line %s (%s).', $this->getRealCurrentLineNb() + 1, $parsedItem));
+                                    throw new \InvalidArgumentException(sprintf('Merge items must be arrays at line %s (%s).', $this->getRealCurrentLineNb() + 1, $parsedItem));
                                 }
                                 $merged = array_merge($parsedItem, $merged);
                             }
@@ -153,13 +154,13 @@ public function parse($value)
                     $data = $isProcessed;
                 }
                 // hash
-                elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                elseif (!isset($values['value']) || '' == trim($values['value'], ' ') ||   str_starts_with(ltrim($values['value'], ' '), '#')) {
                     // if next line is less indented or equal, then it means that the current value is null
                     if ($this->isNextLineIndented()) {
                         $data[$key] = null;
                     } else {
                         $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new sfYamlParser($c);
+                        $parser = new \sfYamlParser($c);
                         $parser->refs = &$this->refs;
                         $data[$key] = $parser->parse($this->getNextEmbedBlock());
                     }
@@ -173,11 +174,11 @@ public function parse($value)
             } else {
                 // 1-liner followed by newline
                 if (2 == count($this->lines) && empty($this->lines[1])) {
-                    $value = sfYamlInline::load($this->lines[0]);
+                    $value = \sfYamlInline::load($this->lines[0]);
                     if (is_array($value)) {
                         $first = reset($value);
                         if ('*' === substr($first, 0, 1)) {
-                            $data = array();
+                            $data = [];
                             foreach ($value as $alias) {
                                 $data[] = $this->refs[substr($alias, 1)];
                             }
@@ -222,7 +223,7 @@ public function parse($value)
                         $error = 'Unable to parse line';
                 }
 
-                throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                throw new \InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
             }
 
             if ($isRef) {
@@ -272,13 +273,13 @@ protected function getNextEmbedBlock($indentation = null)
             $newIndent = $this->getCurrentLineIndentation();
 
             if (!$this->isCurrentLineEmpty() && 0 == $newIndent) {
-                throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                throw new \InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
             }
         } else {
             $newIndent = $indentation;
         }
 
-        $data = array(substr($this->currentLine, $newIndent));
+        $data = [substr($this->currentLine, $newIndent)];
 
         while ($this->moveToNextLine()) {
             if ($this->isCurrentLineEmpty()) {
@@ -301,7 +302,7 @@ protected function getNextEmbedBlock($indentation = null)
 
                 break;
             } else {
-                throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+                throw new \InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
             }
         }
 
@@ -347,7 +348,7 @@ protected function parseValue($value)
             }
 
             if (!array_key_exists($value, $this->refs)) {
-                throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
+                throw new \InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
             }
 
             return $this->refs[$value];
@@ -359,7 +360,7 @@ protected function parseValue($value)
             return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), abs((int) $modifiers));
         }
 
-        return sfYamlInline::load($value);
+        return \sfYamlInline::load($value);
     }
 
     /**
@@ -510,7 +511,7 @@ protected function isCurrentLineComment()
      */
     protected function cleanup($value)
     {
-        $value = str_replace(array("\r\n", "\r"), "\n", $value);
+        $value = str_replace(["\r\n", "\r"], "\n", $value);
 
         if (!preg_match("#\n$#", $value)) {
             $value .= "\n";
diff --git a/test/bin/coverage.php b/test/bin/coverage.php
index 409634821..1293583db 100644
--- a/test/bin/coverage.php
+++ b/test/bin/coverage.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -20,7 +21,7 @@
 
 require_once __DIR__.'/../../lib/util/sfFinder.class.php';
 
-$h = new lime_harness();
+$h = new \lime_harness();
 $h->base_dir = realpath(__DIR__.'/..');
 
 // unit tests
@@ -34,12 +35,12 @@
 $h->register_glob(sprintf('%s/functional/*/%sTest.php', $h->base_dir, $name));
 $h->register_glob(sprintf('%s/../lib/plugins/*/functional/%sTest.php', $h->base_dir, $name));
 
-$c = new lime_coverage($h);
+$c = new \lime_coverage($h);
 $c->extension = '.class.php';
 $c->verbose = $verbose;
 $c->base_dir = realpath(__DIR__.'/../../lib');
 
-$finder = sfFinder::type('file')->name($name.'.class.php')->prune('vendor')->prune('test')->prune('data');
+$finder = \sfFinder::type('file')->name($name.'.class.php')->prune('vendor')->prune('test')->prune('data');
 
 $c->register($finder->in($c->base_dir));
 $c->run();
diff --git a/test/bin/loc.php b/test/bin/loc.php
index a140870d5..7b73cebbc 100755
--- a/test/bin/loc.php
+++ b/test/bin/loc.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $root_dir = realpath(__DIR__.'/../..');
 
 require_once $root_dir.'/lib/vendor/lime/lime.php';
@@ -14,26 +23,26 @@
 
 // symfony core LOC
 $total_loc = 0;
-$files = sfFinder::type('file')->name('*.php')->prune('vendor', 'plugins')->in($root_dir.'/lib');
+$files = \sfFinder::type('file')->name('*.php')->prune('vendor', 'plugins')->in($root_dir.'/lib');
 foreach ($files as $file) {
-    $total_loc += count(lime_coverage::get_php_lines($file));
+    $total_loc += count(\lime_coverage::get_php_lines($file));
 }
-$files = sfFinder::type('file')->name('*.php')->prune('vendor')->in($root_dir.'/lib/plugins/*/lib');
+$files = \sfFinder::type('file')->name('*.php')->prune('vendor')->in($root_dir.'/lib/plugins/*/lib');
 foreach ($files as $file) {
-    $total_loc += count(lime_coverage::get_php_lines($file));
+    $total_loc += count(\lime_coverage::get_php_lines($file));
 }
 
 // symfony tests LOC
 $total_tests_loc = 0;
-$files = sfFinder::type('file')->name('*Test.php')->in(array(
+$files = \sfFinder::type('file')->name('*Test.php')->in([
     $root_dir.'/lib/plugins/sfDoctrinePlugin/test/unit',
     $root_dir.'/lib/plugins/sfDoctrinePlugin/test/functional',
     $root_dir.'/test/unit',
     $root_dir.'/test/functional',
     $root_dir.'/test/other',
-));
+]);
 foreach ($files as $file) {
-    $total_tests_loc += count(lime_coverage::get_php_lines($file));
+    $total_tests_loc += count(\lime_coverage::get_php_lines($file));
 }
 
 printf("core librairies:           %6d\n", $total_loc);
diff --git a/test/bootstrap/functional.php b/test/bootstrap/functional.php
index fd1f3a96a..b1395ee47 100644
--- a/test/bootstrap/functional.php
+++ b/test/bootstrap/functional.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,31 +20,31 @@
 }
 
 require_once $root_dir.'/config/ProjectConfiguration.class.php';
-$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
+$configuration = \ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
 
 // remove all cache
 sf_functional_test_shutdown();
 register_shutdown_function('sf_functional_test_shutdown');
 
-sfContext::createInstance($configuration);
+\sfContext::createInstance($configuration);
 
 function sf_functional_test_shutdown_cleanup()
 {
-    sfToolkit::clearDirectory(sfConfig::get('sf_cache_dir'));
-    sfToolkit::clearDirectory(sfConfig::get('sf_log_dir'));
+    \sfToolkit::clearDirectory(\sfConfig::get('sf_cache_dir'));
+    \sfToolkit::clearDirectory(\sfConfig::get('sf_log_dir'));
 
     $sf_root_dir = sys_get_temp_dir().'/sf_test_project';
     if (is_dir($sf_root_dir)) {
-        sfToolkit::clearDirectory($sf_root_dir);
+        \sfToolkit::clearDirectory($sf_root_dir);
         @rmdir($sf_root_dir);
     }
 
     $sessions = glob(sys_get_temp_dir().'/sessions*');
     $tmp_files = glob(sys_get_temp_dir().'/sf*');
-    $files = array_merge(empty($sessions) ? array() : $sessions, empty($tmp_files) ? array() : $tmp_files);
+    $files = array_merge(empty($sessions) ? [] : $sessions, empty($tmp_files) ? [] : $tmp_files);
     foreach ($files as $file) {
         if (is_dir($file)) {
-            sfToolkit::clearDirectory($file);
+            \sfToolkit::clearDirectory($file);
             @rmdir($file);
         } else {
             @unlink($file);
@@ -56,7 +57,7 @@ function sf_functional_test_shutdown()
     // try/catch needed due to http://bugs.php.net/bug.php?id=33598
     try {
         sf_functional_test_shutdown_cleanup();
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
         echo $e.PHP_EOL;
     }
 }
diff --git a/test/bootstrap/task.php b/test/bootstrap/task.php
index 5518afada..3df3d11f2 100644
--- a/test/bootstrap/task.php
+++ b/test/bootstrap/task.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,14 +11,14 @@
 
 require_once __DIR__.'/unit.php';
 
-require_once sfConfig::get('sf_symfony_lib_dir').'/command/sfCommandApplication.class.php';
+require_once \sfConfig::get('sf_symfony_lib_dir').'/command/sfCommandApplication.class.php';
 
-require_once sfConfig::get('sf_symfony_lib_dir').'/command/sfSymfonyCommandApplication.class.php';
+require_once \sfConfig::get('sf_symfony_lib_dir').'/command/sfSymfonyCommandApplication.class.php';
 
 $tmpDir = sys_get_temp_dir().DIRECTORY_SEPARATOR.'sf_'.rand(11111, 99999);
 mkdir($tmpDir, 0777, true);
 chdir($tmpDir);
 
-$application = new sfSymfonyCommandApplication(new sfEventDispatcher(), new sfFormatter(), array(
-    'symfony_lib_dir' => sfConfig::get('sf_symfony_lib_dir'),
-));
+$application = new \sfSymfonyCommandApplication(new \sfEventDispatcher(), new \sfFormatter(), [
+    'symfony_lib_dir' => \sfConfig::get('sf_symfony_lib_dir'),
+]);
diff --git a/test/bootstrap/unit.php b/test/bootstrap/unit.php
index 616ca94eb..39e8f77c5 100644
--- a/test/bootstrap/unit.php
+++ b/test/bootstrap/unit.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,13 +20,13 @@
 require_once $_test_dir.'/../lib/vendor/lime/lime.php';
 
 require_once $_test_dir.'/../lib/config/sfConfig.class.php';
-sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
+\sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
 
 require_once __DIR__.'/../../lib/autoload/sfCoreAutoload.class.php';
-sfCoreAutoload::register();
+\sfCoreAutoload::register();
 
 require_once __DIR__.'/../../lib/util/sfToolkit.class.php';
-sfConfig::set('sf_test_cache_dir', sys_get_temp_dir().'/sf_test_project');
+\sfConfig::set('sf_test_cache_dir', sys_get_temp_dir().'/sf_test_project');
 
 // remove all test cache
 sf_unit_test_shutdown();
@@ -40,17 +41,17 @@ function sf_unit_test_shutdown()
 {
     $sf_root_dir = sys_get_temp_dir().'/sf_test_project';
     if (is_dir($sf_root_dir)) {
-        sfToolkit::clearDirectory($sf_root_dir);
+        \sfToolkit::clearDirectory($sf_root_dir);
         @rmdir($sf_root_dir);
     }
 
     $sessions = glob(sys_get_temp_dir().'/sessions*');
     $tmp_files = glob(sys_get_temp_dir().'/sf*');
 
-    $files = array_merge(empty($sessions) ? array() : $sessions, empty($tmp_files) ? array() : $tmp_files);
+    $files = array_merge(empty($sessions) ? [] : $sessions, empty($tmp_files) ? [] : $tmp_files);
     foreach ($files as $file) {
         if (is_dir($file)) {
-            sfToolkit::clearDirectory($file);
+            \sfToolkit::clearDirectory($file);
             @rmdir($file);
         } else {
             @unlink($file);
@@ -61,5 +62,5 @@ function sf_unit_test_shutdown()
 // Helper for cross platform testcases that validate output
 function fix_linebreaks($content)
 {
-    return str_replace(array("\r\n", "\n", "\r"), "\n", $content);
+    return str_replace(["\r\n", "\n", "\r"], "\n", $content);
 }
diff --git a/test/functional/authTest.php b/test/functional/authTest.php
index 3a68aa5a5..1ac3a0b5d 100644
--- a/test/functional/authTest.php
+++ b/test/functional/authTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-class sfAuthTestBrowser extends sfTestBrowser
+class sfAuthTestBrowser extends \sfTestBrowser
 {
     public function checkNonAuth()
     {
@@ -48,7 +49,7 @@ public function checkAuth()
     }
 }
 
-$b = new sfAuthTestBrowser();
+$b = new \sfAuthTestBrowser();
 
 // default main page
 $b->
diff --git a/test/functional/autoloadTest.php b/test/functional/autoloadTest.php
index 9a40574ef..d1ce77f02 100755
--- a/test/functional/autoloadTest.php
+++ b/test/functional/autoloadTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 $b->
   get('/autoload/myAutoload')->
@@ -29,7 +30,7 @@
 $t = $b->test();
 
 $t->ok(class_exists('BaseExtendMe'), 'plugin lib directory added to autoload');
-$r = new ReflectionClass('ExtendMe');
+$r = new \ReflectionClass('ExtendMe');
 $t->like(str_replace(DIRECTORY_SEPARATOR, '/', $r->getFilename()), '~fixtures/lib/ExtendMe~', 'plugin class can be replaced by project');
 $t->ok(class_exists('NotInLib'), 'plugin autoload sets class paths');
 $t->ok(!class_exists('ExcludedFromAutoload'), 'plugin autoload excludes directories');
diff --git a/test/functional/cacheTest.php b/test/functional/cacheTest.php
index f0e7a232f..594afeb77 100644
--- a/test/functional/cacheTest.php
+++ b/test/functional/cacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-class myTestBrowser extends sfTestBrowser
+class myTestBrowser extends \sfTestBrowser
 {
     public function checkResponseContent($content, $message)
     {
@@ -57,40 +58,40 @@ public function getMultiAction($parameter = null)
             isCached(false)->
 
             // partial cache
-            isUriCached('@sf_cache_partial?module=cache&action=_partial&sf_cache_key='.md5(serialize(array())), false)->
-            isUriCached('@sf_cache_partial?module=cache&action=_partial&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_partial&sf_cache_key='.md5(serialize([])), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_partial&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), false)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(array())), true)->
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize([])), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), true)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(array('varParam' => 'another'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(['varParam' => 'another'])), false)->
 
             // contextual partial cache
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualPartial&sf_cache_key='.md5(serialize(array())), false)->
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualPartial&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualPartial&sf_cache_key='.md5(serialize([])), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualPartial&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), false)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheablePartial&sf_cache_key='.md5(serialize(array())), true)->
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheablePartial&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheablePartial&sf_cache_key='.md5(serialize([])), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheablePartial&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), true)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheablePartial&sf_cache_key='.md5(serialize(array('varParam' => 'another'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheablePartial&sf_cache_key='.md5(serialize(['varParam' => 'another'])), false)->
 
             // component cache
-            isUriCached('@sf_cache_partial?module=cache&action=_component&sf_cache_key='.md5(serialize(array())), false)->
-            isUriCached('@sf_cache_partial?module=cache&action=_component&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_component&sf_cache_key='.md5(serialize([])), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_component&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), false)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize([])), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), true)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(array('varParam' => 'another'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(['varParam' => 'another'])), false)->
 
             // contextual component cache
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualComponent&sf_cache_key='.md5(serialize(array())), false)->
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualComponent&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualComponent&sf_cache_key='.md5(serialize([])), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualComponent&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), false)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array('varParam' => 'varParam'))), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize([])), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(['varParam' => 'varParam'])), true)->
 
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array('varParam' => 'another'))), false)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(['varParam' => 'another'])), false)->
           end();
     }
 
@@ -150,7 +151,7 @@ public function launch()
           with('view_cache')->isCached(true);
 
         // remove all cache
-        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+        \sfToolkit::clearDirectory(\sfConfig::get('sf_app_cache_dir'));
 
         $b->
           getMultiAction()->
@@ -166,7 +167,7 @@ public function launch()
           end();
 
         // remove all cache
-        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+        \sfToolkit::clearDirectory(\sfConfig::get('sf_app_cache_dir'));
 
         $b->
           getMultiAction('requestParam')->
@@ -223,20 +224,20 @@ public function launch()
           with('view_cache')->begin()->
             isCached(false)->
             // partial cache
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize(array())), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheablePartial&sf_cache_key='.md5(serialize([])), true)->
 
             // contextual partial cache
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize([])), true)->
 
             // component cache
-            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_cacheableComponent&sf_cache_key='.md5(serialize([])), true)->
 
             // contextual component cache
-            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize(array())), true)->
+            isUriCached('@sf_cache_partial?module=cache&action=_contextualCacheableComponent&sf_cache_key='.md5(serialize([])), true)->
           end();
 
         // remove all cache
-        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+        \sfToolkit::clearDirectory(\sfConfig::get('sf_app_cache_dir'));
 
         // check user supplied cache key for partials and components
         $b->
@@ -266,7 +267,7 @@ public function launch()
         // check cache content for actions
 
         // remove all cache
-        sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+        \sfToolkit::clearDirectory(\sfConfig::get('sf_app_cache_dir'));
 
         $b->
           get('/cache/action')->
@@ -277,8 +278,8 @@ public function launch()
           with('response')->isStatusCode(200)->
           with('view_cache')->isCached(true);
 
-        $b->test()->is(sfConfig::get('ACTION_EXECUTED', false), true, 'action is executed when not in cache');
-        sfConfig::set('ACTION_EXECUTED', false);
+        $b->test()->is(\sfConfig::get('ACTION_EXECUTED', false), true, 'action is executed when not in cache');
+        \sfConfig::set('ACTION_EXECUTED', false);
 
         $response = $b->getResponse();
         $content1 = $response->getContent();
@@ -294,7 +295,7 @@ public function launch()
           with('response')->isStatusCode(200)->
           with('view_cache')->isCached(true);
 
-        $b->test()->is(sfConfig::get('ACTION_EXECUTED', false), false, 'action is not executed when in cache');
+        $b->test()->is(\sfConfig::get('ACTION_EXECUTED', false), false, 'action is not executed when in cache');
 
         $response = $b->getResponse();
         $content2 = $response->getContent();
@@ -307,11 +308,11 @@ public function launch()
     }
 }
 
-$b = new myTestBrowser();
+$b = new \myTestBrowser();
 
 // non HTML cache
 $image = file_get_contents(__DIR__.'/fixtures/apps/cache/modules/cache/data/ok48.png');
-sfConfig::set('sf_web_debug', true);
+\sfConfig::set('sf_web_debug', true);
 $b->
   get('/cache/imageWithLayoutCacheWithLayout')->
   with('view_cache')->isCached(true, true)->
@@ -337,10 +338,10 @@ public function launch()
   get('/cache/imageNoLayoutCacheNoLayout')->
   with('view_cache')->isCached(true)->
   checkResponseContent($image, 'image (no layout/action cache) in cache is not decorated when web_debug is on');
-sfConfig::set('sf_web_debug', false);
+\sfConfig::set('sf_web_debug', false);
 
 // check stylesheets, javascripts inclusions
-sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+\sfToolkit::clearDirectory(\sfConfig::get('sf_app_cache_dir'));
 $b->
   get('/cache/multiBis')->
   with('request')->begin()->
@@ -476,12 +477,12 @@ public function launch()
 ;
 
 // check for 304 response
-sfConfig::set('LAST_MODIFIED', strtotime('2010-01-01'));
+\sfConfig::set('LAST_MODIFIED', strtotime('2010-01-01'));
 $b->get('/cache/lastModifiedResponse')
     ->with('response')->isStatusCode(200)
 ;
 
-$b->setHttpHeader('If-Modified-Since', sfWebResponse::getDate(sfConfig::get('LAST_MODIFIED')))
+$b->setHttpHeader('If-Modified-Since', \sfWebResponse::getDate(\sfConfig::get('LAST_MODIFIED')))
     ->get('/cache/lastModifiedResponse')
     ->with('response')->isStatusCode(304)
 ;
@@ -491,7 +492,7 @@ public function launch()
 
 // test with sfSQLiteCache class
 if (extension_loaded('SQLite') || extension_loaded('pdo_SQLite')) {
-    sfConfig::set('sf_factory_view_cache', 'sfSQLiteCache');
-    sfConfig::set('sf_factory_view_cache_parameters', array('database' => sfConfig::get('sf_template_cache_dir').DIRECTORY_SEPARATOR.'cache.db'));
+    \sfConfig::set('sf_factory_view_cache', 'sfSQLiteCache');
+    \sfConfig::set('sf_factory_view_cache_parameters', ['database' => \sfConfig::get('sf_template_cache_dir').DIRECTORY_SEPARATOR.'cache.db']);
     $b->launch();
 }
diff --git a/test/functional/escapingTest.php b/test/functional/escapingTest.php
index fc2a0fab4..e6a69d4ba 100644
--- a/test/functional/escapingTest.php
+++ b/test/functional/escapingTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 $b->get('/escaping/on')
     ->with('request')->begin()
diff --git a/test/functional/filterTest.php b/test/functional/filterTest.php
index 4d8f5f6ff..33f733cb4 100644
--- a/test/functional/filterTest.php
+++ b/test/functional/filterTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 // filter
 $b->
diff --git a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
index 52660cd15..721423a6b 100644
--- a/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
+++ b/test/functional/fixtures/apps/cache/config/cacheConfiguration.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class cacheConfiguration extends sfApplicationConfiguration
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class cacheConfiguration extends \sfApplicationConfiguration
 {
     public function configure()
     {
diff --git a/test/functional/fixtures/apps/cache/lib/myUser.class.php b/test/functional/fixtures/apps/cache/lib/myUser.class.php
index 4c793028e..12f4a6aaf 100644
--- a/test/functional/fixtures/apps/cache/lib/myUser.class.php
+++ b/test/functional/fixtures/apps/cache/lib/myUser.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myUser extends \sfBasicSecurityUser
 {
 }
diff --git a/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php b/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php
index de7cefa92..4728d89e2 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * cache actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class cacheActions extends sfActions
+class cacheActions extends \sfActions
 {
     public function executeIndex()
     {
@@ -61,7 +70,7 @@ public function executeAction()
         $response->addMeta('meta1', 'bar');
         $response->addHttpMeta('httpmeta1', 'foobar');
 
-        sfConfig::set('ACTION_EXECUTED', true);
+        \sfConfig::set('ACTION_EXECUTED', true);
     }
 
     public function executeImageWithLayoutCacheWithLayout()
@@ -90,7 +99,7 @@ public function executeImageNoLayoutCacheNoLayout()
 
     public function executeLastModifiedResponse()
     {
-        $this->getResponse()->setHttpHeader('Last-Modified', $this->getResponse()->getDate(sfConfig::get('LAST_MODIFIED')));
+        $this->getResponse()->setHttpHeader('Last-Modified', $this->getResponse()->getDate(\sfConfig::get('LAST_MODIFIED')));
         $this->setTemplate('action');
     }
 
diff --git a/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php b/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php
index 67397db75..4183686cf 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * cache components.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class cacheComponents extends sfComponents
+class cacheComponents extends \sfComponents
 {
     public function executeComponent()
     {
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/imageSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/imageSuccess.php
index ccd622d7d..5e7b8efc5 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/imageSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/imageSuccess.php
@@ -1,3 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 echo $image;
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/multiSuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/multiSuccess.php
index 24b0b705c..cfbc2357f 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/multiSuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/multiSuccess.php
@@ -2,29 +2,29 @@
 
 <div id="cacheablePartial"><?php include_partial('cache/cacheablePartial'); ?></div>
 
-<div id="cacheablePartialVarParam"><?php include_partial('cache/cacheablePartial', array('varParam' => 'varParam')); ?></div>
+<div id="cacheablePartialVarParam"><?php include_partial('cache/cacheablePartial', ['varParam' => 'varParam']); ?></div>
 
 
 <div id="contextualPartial"><?php include_partial('cache/contextualPartial'); ?></div>
 
 <div id="contextualCacheablePartial"><?php include_partial('cache/contextualCacheablePartial'); ?></div>
 
-<div id="contextualCacheablePartialVarParam"><?php include_partial('cache/contextualCacheablePartial', array('varParam' => 'varParam')); ?></div>
+<div id="contextualCacheablePartialVarParam"><?php include_partial('cache/contextualCacheablePartial', ['varParam' => 'varParam']); ?></div>
 
 
 <div id="component"><?php include_component('cache', 'component'); ?></div>
 
-<div id="componentVarParam"><?php include_component('cache', 'component', array('varParam' => 'varParam')); ?></div>
+<div id="componentVarParam"><?php include_component('cache', 'component', ['varParam' => 'varParam']); ?></div>
 
 <div id="cacheableComponent"><?php include_component('cache', 'cacheableComponent'); ?></div>
 
-<div id="cacheableComponentVarParam"><?php include_component('cache', 'cacheableComponent', array('varParam' => 'varParam')); ?></div>
+<div id="cacheableComponentVarParam"><?php include_component('cache', 'cacheableComponent', ['varParam' => 'varParam']); ?></div>
 
 
 <div id="contextualComponent"><?php include_component('cache', 'contextualComponent'); ?></div>
 
-<div id="contextualComponentVarParam"><?php include_component('cache', 'contextualComponent', array('varParam' => 'varParam')); ?></div>
+<div id="contextualComponentVarParam"><?php include_component('cache', 'contextualComponent', ['varParam' => 'varParam']); ?></div>
 
 <div id="contextualCacheableComponent"><?php include_component('cache', 'contextualCacheableComponent'); ?></div>
 
-<div id="contextualCacheableComponentVarParam"><?php include_component('cache', 'contextualCacheableComponent', array('varParam' => 'varParam')); ?></div>
+<div id="contextualCacheableComponentVarParam"><?php include_component('cache', 'contextualCacheableComponent', ['varParam' => 'varParam']); ?></div>
diff --git a/test/functional/fixtures/apps/cache/modules/cache/templates/specificCacheKeySuccess.php b/test/functional/fixtures/apps/cache/modules/cache/templates/specificCacheKeySuccess.php
index 036dac29a..62710f0f0 100644
--- a/test/functional/fixtures/apps/cache/modules/cache/templates/specificCacheKeySuccess.php
+++ b/test/functional/fixtures/apps/cache/modules/cache/templates/specificCacheKeySuccess.php
@@ -1,5 +1,5 @@
-<div id="cacheablePartialVarParam"><?php include_partial('cache/cacheablePartial', array('varParam' => 'varParam', 'sf_cache_key' => 'cacheablePartial')); ?></div>
-<div id="contextualCacheablePartialVarParam"><?php include_partial('cache/contextualCacheablePartial', array('varParam' => 'varParam', 'sf_cache_key' => 'contextualCacheablePartial')); ?></div>
+<div id="cacheablePartialVarParam"><?php include_partial('cache/cacheablePartial', ['varParam' => 'varParam', 'sf_cache_key' => 'cacheablePartial']); ?></div>
+<div id="contextualCacheablePartialVarParam"><?php include_partial('cache/contextualCacheablePartial', ['varParam' => 'varParam', 'sf_cache_key' => 'contextualCacheablePartial']); ?></div>
 
-<div id="cacheableComponentVarParam"><?php include_component('cache', 'cacheableComponent', array('varParam' => 'varParam', 'sf_cache_key' => 'cacheableComponent')); ?></div>
-<div id="contextualCacheableComponentVarParam"><?php include_component('cache', 'contextualCacheableComponent', array('varParam' => 'varParam', 'sf_cache_key' => 'contextualCacheableComponent')); ?></div>
+<div id="cacheableComponentVarParam"><?php include_component('cache', 'cacheableComponent', ['varParam' => 'varParam', 'sf_cache_key' => 'cacheableComponent']); ?></div>
+<div id="contextualCacheableComponentVarParam"><?php include_component('cache', 'contextualCacheableComponent', ['varParam' => 'varParam', 'sf_cache_key' => 'contextualCacheableComponent']); ?></div>
diff --git a/test/functional/fixtures/apps/cache/modules/httpcache/actions/actions.class.php b/test/functional/fixtures/apps/cache/modules/httpcache/actions/actions.class.php
index d4b0a20a2..0a62f56ab 100644
--- a/test/functional/fixtures/apps/cache/modules/httpcache/actions/actions.class.php
+++ b/test/functional/fixtures/apps/cache/modules/httpcache/actions/actions.class.php
@@ -1,27 +1,36 @@
 <?php
 
-class httpcacheActions extends sfActions
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class httpcacheActions extends \sfActions
 {
-    public function executePage1(sfWebRequest $request)
+    public function executePage1(\sfWebRequest $request)
     {
         $this->setTemplate('index');
     }
 
-    public function executePage2(sfWebRequest $request)
+    public function executePage2(\sfWebRequest $request)
     {
         $this->setTemplate('index');
     }
 
-    public function executePage3(sfWebRequest $request)
+    public function executePage3(\sfWebRequest $request)
     {
-        $this->getResponse()->setHttpHeader('Last-Modified', sfWebResponse::getDate(time() - 86400));
+        $this->getResponse()->setHttpHeader('Last-Modified', \sfWebResponse::getDate(time() - 86400));
 
         $this->setTemplate('index');
     }
 
-    public function executePage4(sfWebRequest $request)
+    public function executePage4(\sfWebRequest $request)
     {
-        $this->getResponse()->setHttpHeader('Last-Modified', sfWebResponse::getDate(time() - 86400));
+        $this->getResponse()->setHttpHeader('Last-Modified', \sfWebResponse::getDate(time() - 86400));
 
         $this->setTemplate('index');
     }
diff --git a/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php b/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php
index a2639d4f0..7c41978e2 100644
--- a/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php
+++ b/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * nocache actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class nocacheActions extends sfActions
+class nocacheActions extends \sfActions
 {
     /**
      * Executes index action.
diff --git a/test/functional/fixtures/apps/cache/templates/image.php b/test/functional/fixtures/apps/cache/templates/image.php
index 9ee5d02c2..c70f8118d 100644
--- a/test/functional/fixtures/apps/cache/templates/image.php
+++ b/test/functional/fixtures/apps/cache/templates/image.php
@@ -1,3 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 echo $sf_content;
diff --git a/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php b/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
index 6d6e4e9a7..941c946d6 100644
--- a/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
+++ b/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
@@ -1,15 +1,24 @@
 <?php
 
-class frontendConfiguration extends sfApplicationConfiguration
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class frontendConfiguration extends \sfApplicationConfiguration
 {
     public function configure()
     {
-        $this->dispatcher->connect('view.configure_format', array($this, 'configure_format_foo'));
-        $this->dispatcher->connect('request.filter_parameters', array($this, 'filter_parameters'));
-        $this->dispatcher->connect('view.configure_format', array($this, 'configure_iphone_format'));
+        $this->dispatcher->connect('view.configure_format', [$this, 'configure_format_foo']);
+        $this->dispatcher->connect('request.filter_parameters', [$this, 'filter_parameters']);
+        $this->dispatcher->connect('view.configure_format', [$this, 'configure_iphone_format']);
     }
 
-    public function filter_parameters(sfEvent $event, $parameters)
+    public function filter_parameters(\sfEvent $event, $parameters)
     {
         if (false !== stripos((string) $event->getSubject()->getHttpHeader('user-agent'), 'iPhone')) {
             $event->getSubject()->setRequestFormat('iphone');
@@ -18,7 +27,7 @@ public function filter_parameters(sfEvent $event, $parameters)
         return $parameters;
     }
 
-    public function configure_iphone_format(sfEvent $event)
+    public function configure_iphone_format(\sfEvent $event)
     {
         if ('iphone' == $event['format']) {
             $event['response']->addStylesheet('iphone.css');
@@ -27,7 +36,7 @@ public function configure_iphone_format(sfEvent $event)
         }
     }
 
-    public function configure_format_foo(sfEvent $event)
+    public function configure_format_foo(\sfEvent $event)
     {
         if ('foo' != $event['format']) {
             return;
diff --git a/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php b/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php
index 2d1e483fb..0f614c10d 100644
--- a/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myAppsFrontendLibClass.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class myAppsFrontendLibClass
 {
     public static function ping()
diff --git a/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php b/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
index 5ab655bee..9e7212d31 100644
--- a/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class myAutoload
 {
     public static function autoload($class)
diff --git a/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php b/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php
index bab3c741c..cb85cf89d 100644
--- a/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myAutoloadedClass.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class myAutoloadedClass
 {
     public function getFoo()
diff --git a/test/functional/fixtures/apps/frontend/lib/myFilter.class.php b/test/functional/fixtures/apps/frontend/lib/myFilter.class.php
index de4a4799c..f2923fcd8 100644
--- a/test/functional/fixtures/apps/frontend/lib/myFilter.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myFilter.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class myFilter extends sfFilter
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myFilter extends \sfFilter
 {
     public function execute($filterChain)
     {
diff --git a/test/functional/fixtures/apps/frontend/lib/myUser.class.php b/test/functional/fixtures/apps/frontend/lib/myUser.class.php
index 4c793028e..12f4a6aaf 100644
--- a/test/functional/fixtures/apps/frontend/lib/myUser.class.php
+++ b/test/functional/fixtures/apps/frontend/lib/myUser.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myUser extends \sfBasicSecurityUser
 {
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php
index a276e02ba..d48b09f5e 100644
--- a/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * assetInclusion actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class assetInclusionActions extends sfActions
+class assetInclusionActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php
index 514eba23d..d0dbe318a 100644
--- a/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * auth actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class authActions extends sfActions
+class authActions extends \sfActions
 {
     public function executeBasic()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php
index 5b0cd69ef..749804daa 100644
--- a/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * autoload actions.
  *
@@ -7,18 +16,18 @@
  *
  * @version    SVN: $Id$
  */
-class autoloadActions extends sfActions
+class autoloadActions extends \sfActions
 {
     public function executeIndex()
     {
-        $this->lib1 = myLibClass::ping();
-        $this->lib2 = myAppsFrontendLibClass::ping();
-        $this->lib3 = myAppsFrontendModulesAutoloadLibClass::ping();
+        $this->lib1 = \myLibClass::ping();
+        $this->lib2 = \myAppsFrontendLibClass::ping();
+        $this->lib3 = \myAppsFrontendModulesAutoloadLibClass::ping();
         $this->lib4 = class_exists('myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass') ? 'pong' : 'nopong';
     }
 
     public function executeMyAutoload()
     {
-        $this->o = new myAutoloadedClass();
+        $this->o = new \myAutoloadedClass();
     }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/autoload/lib/myAppsFrontendModulesAutoloadLib.class.php b/test/functional/fixtures/apps/frontend/modules/autoload/lib/myAppsFrontendModulesAutoloadLib.class.php
index bbd72ec76..daa2149d5 100644
--- a/test/functional/fixtures/apps/frontend/modules/autoload/lib/myAppsFrontendModulesAutoloadLib.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/autoload/lib/myAppsFrontendModulesAutoloadLib.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class myAppsFrontendModulesAutoloadLibClass
 {
     public static function ping()
diff --git a/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php
index 3f4b72c07..7bb4258e9 100644
--- a/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * browser actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class browserActions extends sfActions
+class browserActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php
index 2eaffc78d..0ba93a9c3 100644
--- a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * configFiltersSimpleFilter actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class configFiltersSimpleFilterActions extends sfActions
+class configFiltersSimpleFilterActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/lib/configFiltersSimpleFilterFilter.class.php b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/lib/configFiltersSimpleFilterFilter.class.php
index c34af24b6..51f923fef 100644
--- a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/lib/configFiltersSimpleFilterFilter.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/lib/configFiltersSimpleFilterFilter.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class configFiltersSimpleFilterFilter extends sfFilter
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class configFiltersSimpleFilterFilter extends \sfFilter
 {
     public function execute($filterChain)
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/templates/indexSuccess.php b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/templates/indexSuccess.php
index fcb6754b3..182b0cfe3 100644
--- a/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/templates/indexSuccess.php
@@ -1,3 +1,12 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 echo $sf_params->get('filter');
diff --git a/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php
index 401423512..095e27d0a 100644
--- a/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * configModuleDisabled actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class configModuleDisabledActions extends sfActions
+class configModuleDisabledActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php
index 65f183268..b079a88eb 100644
--- a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * configSecurityIsSecure actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class configSecurityIsSecureActions extends sfActions
+class configSecurityIsSecureActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php
index 82e82f6b2..149b9b6c7 100644
--- a/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * configSecurityIsSecure actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class configSecurityIsSecureActionActions extends sfActions
+class configSecurityIsSecureActionActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php
index 229a77092..ccaf6ca35 100644
--- a/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * configSettingsMaxForwards actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class configSettingsMaxForwardsActions extends sfActions
+class configSettingsMaxForwardsActions extends \sfActions
 {
     public function executeSelfForward()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php
index c15812526..ca29a889f 100644
--- a/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * configViewHasLayout actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class configViewHasLayoutActions extends sfActions
+class configViewHasLayoutActions extends \sfActions
 {
     public function executeWithoutLayout()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php
index d4b3f98b6..82517567d 100644
--- a/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * cookie actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class cookieActions extends sfActions
+class cookieActions extends \sfActions
 {
     public function executeIndex($request)
     {
@@ -18,13 +27,13 @@ public function executeSetCookie($request)
     {
         $this->getResponse()->setCookie('foobar', 'barfoo');
 
-        return sfView::NONE;
+        return \sfView::NONE;
     }
 
     public function executeRemoveCookie($request)
     {
         $this->getResponse()->setCookie('foobar', 'foofoobar', time() - 10);
 
-        return sfView::NONE;
+        return \sfView::NONE;
     }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php
index f48078308..51219ce88 100644
--- a/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * escaping actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class escapingActions extends sfActions
+class escapingActions extends \sfActions
 {
     public function preExecute()
     {
@@ -18,11 +27,11 @@ public function preExecute()
 
     public function executeOn()
     {
-        sfConfig::set('sf_escaping_strategy', true);
+        \sfConfig::set('sf_escaping_strategy', true);
     }
 
     public function executeOff()
     {
-        sfConfig::set('sf_escaping_strategy', false);
+        \sfConfig::set('sf_escaping_strategy', false);
     }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial1.php b/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial1.php
index 6db1dc574..05a453305 100644
--- a/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial1.php
+++ b/test/functional/fixtures/apps/frontend/modules/escaping/templates/_partial1.php
@@ -3,4 +3,4 @@
 
 <span class="<?php echo $sf_data->getRaw('arr') ? 'yes' : 'no'; ?>"></span>
 
-<?php include_partial('escaping/partial2', array('var' => $var, 'arr' => $arr)); ?>
+<?php include_partial('escaping/partial2', ['var' => $var, 'arr' => $arr]); ?>
diff --git a/test/functional/fixtures/apps/frontend/modules/escaping/templates/indexSuccess.php b/test/functional/fixtures/apps/frontend/modules/escaping/templates/indexSuccess.php
index dd4e6bb8b..5d4aa2103 100644
--- a/test/functional/fixtures/apps/frontend/modules/escaping/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/frontend/modules/escaping/templates/indexSuccess.php
@@ -1,4 +1,4 @@
 <h1><?php echo $var; ?></h1>
 <h2><?php echo $sf_data->get('var'); ?></h2>
 
-<?php include_partial('escaping/partial1', array('var' => $var, 'arr' => array())); ?>
+<?php include_partial('escaping/partial1', ['var' => $var, 'arr' => []]); ?>
diff --git a/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php
index 0c265b988..a30b47ef2 100644
--- a/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * exception actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class exceptionActions extends sfActions
+class exceptionActions extends \sfActions
 {
     public function executeNoException()
     {
@@ -16,11 +25,11 @@ public function executeNoException()
 
     public function executeThrowsException()
     {
-        throw new Exception('Exception message');
+        throw new \Exception('Exception message');
     }
 
     public function executeThrowsSfException()
     {
-        throw new sfException('sfException message');
+        throw new \sfException('sfException message');
     }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php
index 9ceb65023..572e88878 100644
--- a/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * filter actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class filterActions extends sfActions
+class filterActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php
index a2cbb8aef..da3f3881b 100644
--- a/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * format actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class formatActions extends sfActions
+class formatActions extends \sfActions
 {
     public function executeIndex($request)
     {
@@ -33,13 +42,13 @@ public function executeJsWithAccept()
 
     public function executeThrowsException()
     {
-        throw new Exception('Descriptive message');
+        throw new \Exception('Descriptive message');
     }
 
     public function executeThrowsNonDebugException()
     {
-        sfConfig::set('sf_debug', false);
+        \sfConfig::set('sf_debug', false);
 
-        throw new Exception('Descriptive message');
+        throw new \Exception('Descriptive message');
     }
 }
diff --git a/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php
index 9148da1fa..722e33e72 100644
--- a/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * notfound actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class notfoundActions extends sfActions
+class notfoundActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php
index 93bb4605f..b9ab13a5f 100644
--- a/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * presentation actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class presentationActions extends sfActions
+class presentationActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php
index 391001738..49ff66fe1 100644
--- a/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * renderText actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class renderTextActions extends sfActions
+class renderTextActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php b/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php
index 7bd56d590..448ad3893 100644
--- a/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php
+++ b/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * view actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class viewActions extends sfActions
+class viewActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php b/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php
index bf098cfb6..c2937e5df 100644
--- a/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php
+++ b/test/functional/fixtures/apps/i18n/config/i18nConfiguration.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class i18nConfiguration extends sfApplicationConfiguration
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class i18nConfiguration extends \sfApplicationConfiguration
 {
     public function setup()
     {
diff --git a/test/functional/fixtures/apps/i18n/lib/myUser.class.php b/test/functional/fixtures/apps/i18n/lib/myUser.class.php
index 4c793028e..12f4a6aaf 100644
--- a/test/functional/fixtures/apps/i18n/lib/myUser.class.php
+++ b/test/functional/fixtures/apps/i18n/lib/myUser.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class myUser extends sfBasicSecurityUser
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myUser extends \sfBasicSecurityUser
 {
 }
diff --git a/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php b/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php
index f18d733f5..06ad5980a 100644
--- a/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php
+++ b/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * i18n actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class i18nActions extends sfActions
+class i18nActions extends \sfActions
 {
     public function executeIndex()
     {
@@ -15,8 +24,8 @@ public function executeIndex()
 
         $this->test = $i18n->__('an english sentence');
         $this->localTest = $i18n->__('a local english sentence');
-        $this->otherTest = $i18n->__('an english sentence', array(), 'other');
-        $this->otherLocalTest = $i18n->__('a local english sentence', array(), 'other');
+        $this->otherTest = $i18n->__('an english sentence', [], 'other');
+        $this->otherLocalTest = $i18n->__('a local english sentence', [], 'other');
     }
 
     public function executeIndexForFr()
@@ -29,17 +38,17 @@ public function executeIndexForFr()
         $this->forward('i18n', 'index');
     }
 
-    public function executeI18nForm(sfWebRequest $request)
+    public function executeI18nForm(\sfWebRequest $request)
     {
-        $this->form = new I18nForm();
+        $this->form = new \I18nForm();
         if ($request->isMethod('post')) {
             $this->form->bind($request->getParameter('i18n'));
         }
     }
 
-    public function executeI18nCustomCatalogueForm(sfWebRequest $request)
+    public function executeI18nCustomCatalogueForm(\sfWebRequest $request)
     {
-        $this->form = new I18nCustomCatalogueForm();
+        $this->form = new \I18nCustomCatalogueForm();
         $this->setTemplate('i18nForm');
     }
 }
diff --git a/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nCustomCatalogueForm.class.php b/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nCustomCatalogueForm.class.php
index f35f55c1e..7932d0dc8 100644
--- a/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nCustomCatalogueForm.class.php
+++ b/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nCustomCatalogueForm.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class I18nCustomCatalogueForm extends I18nForm
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class I18nCustomCatalogueForm extends \I18nForm
 {
     public function configure()
     {
diff --git a/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nForm.class.php b/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nForm.class.php
index c55f02b4d..f80b7c992 100644
--- a/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nForm.class.php
+++ b/test/functional/fixtures/apps/i18n/modules/i18n/lib/I18nForm.class.php
@@ -1,23 +1,32 @@
 <?php
 
-class I18nForm extends sfForm
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class I18nForm extends \sfForm
 {
     public function configure()
     {
-        $this->setWidgets(array(
-            'first_name' => new sfWidgetFormInputText(),
-            'last_name' => new sfWidgetFormInputText(),
-            'email' => new sfWidgetFormInputText(),
-        ));
+        $this->setWidgets([
+            'first_name' => new \sfWidgetFormInputText(),
+            'last_name' => new \sfWidgetFormInputText(),
+            'email' => new \sfWidgetFormInputText(),
+        ]);
 
-        $this->setValidators(array(
-            'first_name' => new sfValidatorString(array('required' => true)),
-            'last_name' => new sfValidatorString(array('required' => true)),
-            'email' => new sfValidatorEmail(
-                array('required' => true),
-                array('invalid' => '%value% is an invalid email address')
+        $this->setValidators([
+            'first_name' => new \sfValidatorString(['required' => true]),
+            'last_name' => new \sfValidatorString(['required' => true]),
+            'email' => new \sfValidatorEmail(
+                ['required' => true],
+                ['invalid' => '%value% is an invalid email address']
             ),
-        ));
+        ]);
 
         $this->widgetSchema->setLabel('email', 'Email address');
         $this->widgetSchema->setHelp('first_name', 'Put your first name here');
diff --git a/test/functional/fixtures/apps/i18n/modules/i18n/templates/indexSuccess.php b/test/functional/fixtures/apps/i18n/modules/i18n/templates/indexSuccess.php
index 550290c85..285091759 100644
--- a/test/functional/fixtures/apps/i18n/modules/i18n/templates/indexSuccess.php
+++ b/test/functional/fixtures/apps/i18n/modules/i18n/templates/indexSuccess.php
@@ -7,7 +7,7 @@
 <div id="template_local"><?php echo __('a local english sentence'); ?></div>
 
 <div id="action_other"><?php echo $otherTest; ?></div>
-<div id="template_other"><?php echo __('an english sentence', array(), 'other'); ?></div>
+<div id="template_other"><?php echo __('an english sentence', [], 'other'); ?></div>
 
 <div id="action_other_local"><?php echo $otherLocalTest; ?></div>
-<div id="template_other_local"><?php echo __('a local english sentence', array(), 'other'); ?></div>
+<div id="template_other_local"><?php echo __('a local english sentence', [], 'other'); ?></div>
diff --git a/test/functional/fixtures/config/ProjectConfiguration.class.php b/test/functional/fixtures/config/ProjectConfiguration.class.php
index 9d3e52ae1..d05d8e8e4 100644
--- a/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ b/test/functional/fixtures/config/ProjectConfiguration.class.php
@@ -1,13 +1,22 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../../../../lib/autoload/sfCoreAutoload.class.php';
-sfCoreAutoload::register();
+\sfCoreAutoload::register();
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
     public function setup()
     {
-        $this->enableAllPluginsExcept(array('sfDoctrinePlugin'));
+        $this->enableAllPluginsExcept(['sfDoctrinePlugin']);
         $this->enablePlugins('sfAutoloadPlugin');
     }
 }
diff --git a/test/functional/fixtures/lib/ExtendMe.class.php b/test/functional/fixtures/lib/ExtendMe.class.php
index 5802db328..1eebb5eb4 100644
--- a/test/functional/fixtures/lib/ExtendMe.class.php
+++ b/test/functional/fixtures/lib/ExtendMe.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class ExtendMe extends BaseExtendMe
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class ExtendMe extends \BaseExtendMe
 {
 }
diff --git a/test/functional/fixtures/lib/form/BaseForm.class.php b/test/functional/fixtures/lib/form/BaseForm.class.php
index f7ffaad5e..143164658 100644
--- a/test/functional/fixtures/lib/form/BaseForm.class.php
+++ b/test/functional/fixtures/lib/form/BaseForm.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * Base project form.
  *
@@ -7,6 +16,6 @@
  *
  * @version    SVN: $Id$
  */
-class BaseForm extends sfFormSymfony
+class BaseForm extends \sfFormSymfony
 {
 }
diff --git a/test/functional/fixtures/lib/myLibClass.class.php b/test/functional/fixtures/lib/myLibClass.class.php
index 008ad8d9b..f9632842d 100644
--- a/test/functional/fixtures/lib/myLibClass.class.php
+++ b/test/functional/fixtures/lib/myLibClass.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class myLibClass
 {
     public static function ping()
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php
index faf367bd2..79ac74e0a 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/NotInLib.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class NotInLib
 {
 }
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/sfAutoloadPluginConfiguration.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/sfAutoloadPluginConfiguration.class.php
index 0eeaa1994..692b34b09 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/config/sfAutoloadPluginConfiguration.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/config/sfAutoloadPluginConfiguration.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class sfAutoloadPluginConfiguration extends sfPluginConfiguration
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class sfAutoloadPluginConfiguration extends \sfPluginConfiguration
 {
 }
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/BaseExtendMe.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/BaseExtendMe.class.php
index 1430b5782..457866918 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/BaseExtendMe.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/BaseExtendMe.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class BaseExtendMe
 {
 }
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/ExtendMe.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/ExtendMe.class.php
index 5802db328..1eebb5eb4 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/ExtendMe.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/lib/ExtendMe.class.php
@@ -1,5 +1,14 @@
 <?php
 
-class ExtendMe extends BaseExtendMe
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class ExtendMe extends \BaseExtendMe
 {
 }
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/actions/actions.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/actions/actions.class.php
index ebf2a9c5a..a1dd821c8 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/actions/actions.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/actions/actions.class.php
@@ -1,11 +1,20 @@
 <?php
 
-class autoloadPluginActions extends sfActions
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class autoloadPluginActions extends \sfActions
 {
     public function executeIndex()
     {
-        $this->lib1 = myLibClass::ping();
-        $this->lib2 = myAppsFrontendLibClass::ping();
-        $this->lib3 = myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass::ping();
+        $this->lib1 = \myLibClass::ping();
+        $this->lib2 = \myAppsFrontendLibClass::ping();
+        $this->lib3 = \myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass::ping();
     }
 }
diff --git a/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/lib/myPluginsSfAutoloadPluginModulesAutoloadPluginLib.class.php b/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/lib/myPluginsSfAutoloadPluginModulesAutoloadPluginLib.class.php
index 5a62975aa..cd55aff88 100644
--- a/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/lib/myPluginsSfAutoloadPluginModulesAutoloadPluginLib.class.php
+++ b/test/functional/fixtures/plugins/sfAutoloadPlugin/modules/autoloadPlugin/lib/myPluginsSfAutoloadPluginModulesAutoloadPluginLib.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class myPluginsSfAutoloadPluginModulesAutoloadPluginLibClass
 {
     public static function ping()
diff --git a/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php b/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php
index 764a65d0a..c34847aea 100644
--- a/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php
+++ b/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * sfI18NPlugin actions.
  *
@@ -7,7 +16,7 @@
  *
  * @version    SVN: $Id$
  */
-class sfI18NPluginActions extends sfActions
+class sfI18NPluginActions extends \sfActions
 {
     public function executeIndex()
     {
diff --git a/test/functional/formatTest.php b/test/functional/formatTest.php
index 7050f8659..8abb06a87 100644
--- a/test/functional/formatTest.php
+++ b/test/functional/formatTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 $b->
   get('/format_test.js')->
diff --git a/test/functional/genericTest.php b/test/functional/genericTest.php
index d6d3e7ba9..a120afa4c 100644
--- a/test/functional/genericTest.php
+++ b/test/functional/genericTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 // default main page
 $b->
@@ -37,8 +38,8 @@
 ;
 */
 // 404 with ETag enabled must returns 404, not 304
-sfConfig::set('sf_cache', true);
-sfConfig::set('sf_etag', true);
+\sfConfig::set('sf_cache', true);
+\sfConfig::set('sf_etag', true);
 $b->
   get('/notfound')->
   with('request')->begin()->
@@ -59,8 +60,8 @@
     isStatusCode(404)->
     checkElement('body', '/404/')->
   end();
-sfConfig::set('sf_cache', false);
-sfConfig::set('sf_etag', false);
+\sfConfig::set('sf_cache', false);
+\sfConfig::set('sf_etag', false);
 
 // unexistant action
 $b->
diff --git a/test/functional/httpcacheTest.php b/test/functional/httpcacheTest.php
index 07b00a639..d363b3a78 100644
--- a/test/functional/httpcacheTest.php
+++ b/test/functional/httpcacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,13 +14,13 @@
     return;
 }
 
-$b = new sfTestFunctional(new sfBrowser());
+$b = new \sfTestFunctional(new \sfBrowser());
 
 $b->
   info('No expiration (client_lifetime is 0)')->
   get('/httpcache/page1')->
   with('response')->begin()->
-    isHeader('Last-Modified', '/^'.substr(preg_quote(sfWebResponse::getDate(time()), '/'), 5, 16).'/')->
+    isHeader('Last-Modified', '/^'.substr(preg_quote(\sfWebResponse::getDate(time()), '/'), 5, 16).'/')->
     isHeader('ETag', true)->
     isHeader('Expires', false)->
     isHeader('Cache-Control', false)->
@@ -31,7 +32,7 @@
   with('response')->begin()->
     isHeader('Last-Modified', false)->
     isHeader('ETag', false)->
-    isHeader('Expires', '/^'.substr(preg_quote(sfWebResponse::getDate(time() + 86400), '/'), 5, 16).'/')->
+    isHeader('Expires', '/^'.substr(preg_quote(\sfWebResponse::getDate(time() + 86400), '/'), 5, 16).'/')->
     isHeader('Cache-Control', '/max-age=86400/')->
   end();
 
@@ -39,7 +40,7 @@
   info('Expiration (client_lifetime is 86400) but the developer has set a Last-Modified header')->
   get('/httpcache/page3')->
   with('response')->begin()->
-    isHeader('Last-Modified', '/^'.substr(preg_quote(sfWebResponse::getDate(time() - 86400), '/'), 5, 16).'/')->
+    isHeader('Last-Modified', '/^'.substr(preg_quote(\sfWebResponse::getDate(time() - 86400), '/'), 5, 16).'/')->
     isHeader('ETag', false)->
     isHeader('Expires', false)->
     isHeader('Cache-Control', false)->
@@ -49,7 +50,7 @@
   info('No expiration and the developer has set a Last-Modified header')->
   get('/httpcache/page4')->
   with('response')->begin()->
-    isHeader('Last-Modified', '/^'.substr(preg_quote(sfWebResponse::getDate(time() - 86400), '/'), 5, 16).'/')->
+    isHeader('Last-Modified', '/^'.substr(preg_quote(\sfWebResponse::getDate(time() - 86400), '/'), 5, 16).'/')->
     isHeader('ETag', true)->
     isHeader('Expires', false)->
     isHeader('Cache-Control', false)->
diff --git a/test/functional/i18nFormTest.php b/test/functional/i18nFormTest.php
index 97cf10d16..594e86f1e 100644
--- a/test/functional/i18nFormTest.php
+++ b/test/functional/i18nFormTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 // default culture (en)
 $b->
@@ -25,16 +26,16 @@
   with('user')->isCulture('en')->
   with('response')->begin()->
     isStatusCode(200)->
-    checkElement('label', 'First name', array('position' => 0))->
-    checkElement('label', 'Last name', array('position' => 1))->
-    checkElement('label', 'Email address', array('position' => 2))->
-    checkElement('td', '/Put your first name here/i', array('position' => 0))->
+    checkElement('label', 'First name', ['position' => 0])->
+    checkElement('label', 'Last name', ['position' => 1])->
+    checkElement('label', 'Email address', ['position' => 2])->
+    checkElement('td', '/Put your first name here/i', ['position' => 0])->
   end()->
   setField('i18n[email]', 'foo/bar')->
   click('Submit')->
   with('response')->begin()->
-    checkElement('ul li', 'Required.', array('position' => 0))->
-    checkElement('ul li', 'foo/bar is an invalid email address', array('position' => 2))->
+    checkElement('ul li', 'Required.', ['position' => 0])->
+    checkElement('ul li', 'foo/bar is an invalid email address', ['position' => 2])->
   end();
 
 // changed culture (fr)
@@ -47,16 +48,16 @@
   with('user')->isCulture('fr')->
   with('response')->begin()->
     isStatusCode(200)->
-    checkElement('label', 'Prénom', array('position' => 0))->
-    checkElement('label', 'Nom', array('position' => 1))->
-    checkElement('label', 'Adresse email', array('position' => 2))->
-    checkElement('td', '/Mettez votre prénom ici/i', array('position' => 0))->
+    checkElement('label', 'Prénom', ['position' => 0])->
+    checkElement('label', 'Nom', ['position' => 1])->
+    checkElement('label', 'Adresse email', ['position' => 2])->
+    checkElement('td', '/Mettez votre prénom ici/i', ['position' => 0])->
   end()->
   setField('i18n[email]', 'foo/bar')->
   click('Submit')->
   with('response')->begin()->
-    checkElement('ul li', 'Champ requis.', array('position' => 0))->
-    checkElement('ul li', 'foo/bar est une adresse email invalide', array('position' => 2))->
+    checkElement('ul li', 'Champ requis.', ['position' => 0])->
+    checkElement('ul li', 'foo/bar est une adresse email invalide', ['position' => 2])->
   end();
 
 // forms label custom catalogue test
@@ -69,7 +70,7 @@
   with('user')->isCulture('fr')->
   with('response')->begin()->
     isStatusCode(200)->
-    checkElement('label', 'Prénom!!!', array('position' => 0))->
-    checkElement('label', 'Nom!!!', array('position' => 1))->
-    checkElement('label', 'Adresse email!!!', array('position' => 2))->
+    checkElement('label', 'Prénom!!!', ['position' => 0])->
+    checkElement('label', 'Nom!!!', ['position' => 1])->
+    checkElement('label', 'Adresse email!!!', ['position' => 2])->
   end();
diff --git a/test/functional/i18nTest.php b/test/functional/i18nTest.php
index 540232ad3..d8b83c6b9 100644
--- a/test/functional/i18nTest.php
+++ b/test/functional/i18nTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
     return;
 }
 
-class myTestBrowser extends sfTestBrowser
+class myTestBrowser extends \sfTestBrowser
 {
     public function checkResponseForCulture($culture = 'fr')
     {
@@ -38,7 +39,7 @@ public function checkResponseForCulture($culture = 'fr')
     }
 }
 
-$b = new myTestBrowser();
+$b = new \myTestBrowser();
 
 // default culture (en)
 $b->
diff --git a/test/functional/prodTest.php b/test/functional/prodTest.php
index e5db92dd3..002720aba 100644
--- a/test/functional/prodTest.php
+++ b/test/functional/prodTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +15,7 @@
     return;
 }
 
-$b = new sfTestBrowser();
+$b = new \sfTestBrowser();
 
 // default main page (without cache)
 $b->
diff --git a/test/functional/sfTestBrowserTest.php b/test/functional/sfTestBrowserTest.php
index 2faebebf8..7d5853407 100644
--- a/test/functional/sfTestBrowserTest.php
+++ b/test/functional/sfTestBrowserTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,18 +14,18 @@
     return;
 }
 
-class TestBrowser extends sfTestBrowser
+class TestBrowser extends \sfTestBrowser
 {
-    public $events = array();
+    public $events = [];
 
-    public function listen(sfEvent $event)
+    public function listen(\sfEvent $event)
     {
         $this->events[] = $event;
     }
 }
 
-$b = new TestBrowser();
-$b->addListener('context.load_factories', array($b, 'listen'));
+$b = new \TestBrowser();
+$b->addListener('context.load_factories', [$b, 'listen']);
 
 // listeners
 $b->get('/');
@@ -106,7 +107,7 @@ public function listen(sfEvent $event)
 try {
     $b->with('response')->checkElement('h1', 'text');
     $b->test()->fail('The DOM is not accessible if the response content type is not HTML');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $b->test()->pass('The DOM is not accessible if the response content type is not HTML');
 }
 
diff --git a/test/other/fixtures/task/myPluginTask.class.php b/test/other/fixtures/task/myPluginTask.class.php
index 4bd4628a9..8589c93b5 100644
--- a/test/other/fixtures/task/myPluginTask.class.php
+++ b/test/other/fixtures/task/myPluginTask.class.php
@@ -1,6 +1,15 @@
 <?php
 
-class myPluginTask extends sfBaseTask
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class myPluginTask extends \sfBaseTask
 {
     public function configure()
     {
@@ -8,7 +17,7 @@ public function configure()
         $this->name = 'run';
     }
 
-    public function execute($arguments = array(), $options = array())
+    public function execute($arguments = [], $options = [])
     {
     }
 }
diff --git a/test/other/fixtures/test/unit/testTest.php b/test/other/fixtures/test/unit/testTest.php
index 1a99b8ad2..aca23ea42 100644
--- a/test/other/fixtures/test/unit/testTest.php
+++ b/test/other/fixtures/test/unit/testTest.php
@@ -1,7 +1,16 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 include __DIR__.'/../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 $t->pass('this is ok');
diff --git a/test/other/tasksTest.php b/test/other/tasksTest.php
index 22c88a4a0..5fecd70af 100644
--- a/test/other/tasksTest.php
+++ b/test/other/tasksTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $_test_dir = realpath(__DIR__.'/..');
 
 require_once $_test_dir.'/../lib/vendor/lime/lime.php';
@@ -31,7 +40,7 @@ public function initialize($t)
         $this->current_dir = getcwd();
         chdir($this->tmp_dir);
 
-        $this->php_cli = sfToolkit::getPhpCli();
+        $this->php_cli = \sfToolkit::getPhpCli();
     }
 
     public function shutdown()
@@ -62,12 +71,12 @@ public function get_fixture_content($file)
     protected function clearTmpDir()
     {
         require_once __DIR__.'/../../lib/util/sfToolkit.class.php';
-        sfToolkit::clearDirectory($this->tmp_dir);
+        \sfToolkit::clearDirectory($this->tmp_dir);
     }
 }
 
 $plan = 18;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
     $t->skip('You need SQLite to run these tests', $plan);
@@ -75,7 +84,7 @@ protected function clearTmpDir()
     return;
 }
 
-$c = new sf_test_project();
+$c = new \sf_test_project();
 $c->initialize($t);
 
 // generate:*
diff --git a/test/unit/action/sfComponentTest.php b/test/unit/action/sfComponentTest.php
index 215245b0e..c60bbb2a7 100644
--- a/test/unit/action/sfComponentTest.php
+++ b/test/unit/action/sfComponentTest.php
@@ -1,10 +1,11 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license information, please component the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -14,23 +15,23 @@
 
 require_once $_test_dir.'/unit/sfNoRouting.class.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
-class myComponent extends sfComponent
+class myComponent extends \sfComponent
 {
     public function execute($request)
     {
     }
 }
 
-$context = sfContext::getInstance(array(
+$context = \sfContext::getInstance([
     'routing' => 'sfNoRouting',
     'request' => 'sfWebRequest',
-));
+]);
 
 // ->initialize()
 $t->diag('->initialize()');
-$component = new myComponent($context, 'module', 'action');
+$component = new \myComponent($context, 'module', 'action');
 $t->is($component->getContext(), $context, '->initialize() takes a sfContext object as its first argument');
 $component->initialize($context, 'module', 'action');
 $t->is($component->getContext(), $context, '->initialize() takes a sfContext object as its first argument');
@@ -52,11 +53,11 @@ public function execute($request)
 
 // __set()
 $t->diag('__set()');
-$component->foo = array();
+$component->foo = [];
 $component->foo[] = 'bar';
-$t->is($component->foo, array('bar'), '__set() populates component variables');
+$t->is($component->foo, ['bar'], '__set() populates component variables');
 
 // new methods via sfEventDispatcher
 require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
-$dispatcherTest = new sfEventDispatcherTest($t);
+$dispatcherTest = new \sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($context->getEventDispatcher(), $component, 'component');
diff --git a/test/unit/addon/sfPagerTest.php b/test/unit/addon/sfPagerTest.php
index 7b5df6286..7a2e64745 100644
--- a/test/unit/addon/sfPagerTest.php
+++ b/test/unit/addon/sfPagerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,8 +11,8 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
-class myPager extends sfPager
+$t = new \lime_test(2);
+class myPager extends \sfPager
 {
     public function init()
     {
@@ -25,11 +26,11 @@ public function getResults()
     {
         $this->setNbResults(2);
 
-        return array('foo', 'bar');
+        return ['foo', 'bar'];
     }
 }
 
-$pager = new myPager('fooClass');
+$pager = new \myPager('fooClass');
 
 // #8021
 // ->rewind()
diff --git a/test/unit/autoload/sfCoreAutoloadTest.php b/test/unit/autoload/sfCoreAutoloadTest.php
index 4d86f6902..49a9f29e8 100644
--- a/test/unit/autoload/sfCoreAutoloadTest.php
+++ b/test/unit/autoload/sfCoreAutoloadTest.php
@@ -1,16 +1,17 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license information, please component the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$autoload = sfCoreAutoload::getInstance();
+$autoload = \sfCoreAutoload::getInstance();
 $t->is($autoload->getClassPath('sfaction'), $autoload->getBaseDir().'/action/sfAction.class.php', '"sfCoreAutoload" is case-insensitive');
diff --git a/test/unit/autoload/sfSimpleAutoloadTest.php b/test/unit/autoload/sfSimpleAutoloadTest.php
index a6b02d32b..8f31588e2 100644
--- a/test/unit/autoload/sfSimpleAutoloadTest.php
+++ b/test/unit/autoload/sfSimpleAutoloadTest.php
@@ -1,18 +1,19 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license information, please component the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$autoload = sfSimpleAutoload::getInstance();
+$autoload = \sfSimpleAutoload::getInstance();
 $autoload->addFile(__DIR__.'/../sfEventDispatcherTest.class.php');
 $autoload->register();
 
diff --git a/test/unit/cache/sfAPCCacheTest.php b/test/unit/cache/sfAPCCacheTest.php
index 32f7b6bba..ae45ae1af 100644
--- a/test/unit/cache/sfAPCCacheTest.php
+++ b/test/unit/cache/sfAPCCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,7 +12,7 @@
 require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 64;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (extension_loaded('apc')) {
     $cacheClass = 'sfAPCCache';
@@ -30,7 +31,7 @@
 
 try {
     new $cacheClass();
-} catch (sfInitializationException $e) {
+} catch (\sfInitializationException $e) {
     $t->skip($e->getMessage(), $plan);
 
     return;
@@ -45,7 +46,7 @@
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
-sfConfig::set('sf_logging_enabled', false);
+\sfConfig::set('sf_logging_enabled', false);
 
 // ->initialize()
 $t->diag('->initialize()');
@@ -56,4 +57,4 @@
 // see https://github.com/krakjoe/apcu/issues/391
 ini_set('apc.use_request_time', 0);
 
-sfCacheDriverTests::launch($t, $cache);
+\sfCacheDriverTests::launch($t, $cache);
diff --git a/test/unit/cache/sfCacheDriverTests.class.php b/test/unit/cache/sfCacheDriverTests.class.php
index 60cb3e9ac..06fcd4249 100644
--- a/test/unit/cache/sfCacheDriverTests.class.php
+++ b/test/unit/cache/sfCacheDriverTests.class.php
@@ -1,12 +1,14 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 class sfCacheDriverTests
 {
     public static function launch($t, $cache)
@@ -52,7 +54,7 @@ public static function launch($t, $cache)
         $cache->set('bar', $data, 86400);
         sleep(2);
 
-        $cache->clean(sfCache::OLD);
+        $cache->clean(\sfCache::OLD);
         $t->is($cache->has('foo'), false, '->clean() cleans old cache key if given the sfCache::OLD argument');
         $t->is($cache->has('bar'), true, '->clean() cleans old cache key if given the sfCache::OLD argument');
 
@@ -60,7 +62,7 @@ public static function launch($t, $cache)
         sleep(2);
         $cache->set('bar', $data, 86400);
 
-        $cache->clean(sfCache::ALL);
+        $cache->clean(\sfCache::ALL);
         $t->is($cache->has('foo'), false, '->clean() cleans all cache key if given the sfCache::ALL argument');
         $t->is($cache->has('bar'), false, '->clean() cleans all cache key if given the sfCache::ALL argument');
 
@@ -94,14 +96,14 @@ public static function launch($t, $cache)
         // ->removePattern()
         $t->diag('->removePattern()');
 
-        $tests = array(
-            '*:bar:foo' => array(false, false, true, true),
-            'foo:bar:*' => array(false, true, false, true),
-            'foo:**:foo' => array(false, true, true, true),
-            'foo:bar:**' => array(false, true, false, false),
-            '**:bar' => array(true, true, true, false),
-            '**' => array(false, false, false, false),
-        );
+        $tests = [
+            '*:bar:foo' => [false, false, true, true],
+            'foo:bar:*' => [false, true, false, true],
+            'foo:**:foo' => [false, true, true, true],
+            'foo:bar:**' => [false, true, false, false],
+            '**:bar' => [true, true, true, false],
+            '**' => [false, false, false, false],
+        ];
 
         foreach ($tests as $pattern => $results) {
             $t->diag($pattern);
@@ -123,7 +125,7 @@ public static function launch($t, $cache)
 
         // ->getTimeout()
         $t->diag('->getTimeout()');
-        foreach (array(86400, 10) as $lifetime) {
+        foreach ([86400, 10] as $lifetime) {
             $cache->set('foo', 'bar', $lifetime);
 
             $delta = $cache->getTimeout('foo') - time();
@@ -134,7 +136,7 @@ public static function launch($t, $cache)
         sleep(2);
         $t->is($cache->getTimeout('bar'), 0, '->getTimeout() returns the timeout time for a given cache key');
 
-        foreach (array(86400, 10) as $lifetime) {
+        foreach ([86400, 10] as $lifetime) {
             $cache->setOption('lifetime', $lifetime);
             $cache->set('foo', 'bar');
 
@@ -146,7 +148,7 @@ public static function launch($t, $cache)
 
         // ->getLastModified()
         $t->diag('->getLastModified()');
-        foreach (array(86400, 10) as $lifetime) {
+        foreach ([86400, 10] as $lifetime) {
             $cache->set('bar', 'foo', $lifetime);
             $now = time();
             $lastModified = $cache->getLastModified('bar');
@@ -157,7 +159,7 @@ public static function launch($t, $cache)
         sleep(2);
         $t->is($cache->getLastModified('bar'), 0, '->getLastModified() returns the last modified time for a given cache key');
 
-        foreach (array(86400, 10) as $lifetime) {
+        foreach ([86400, 10] as $lifetime) {
             $cache->setOption('lifetime', $lifetime);
             $cache->set('bar', 'foo');
 
@@ -175,7 +177,7 @@ public static function launch($t, $cache)
         $cache->set('bar', 'foo');
         $cache->set('foo', 'bar');
 
-        $t->is($cache->getMany(array('foo', 'bar')), array('foo' => 'bar', 'bar' => 'foo'), '->getMany() gets many keys in one call');
+        $t->is($cache->getMany(['foo', 'bar']), ['foo' => 'bar', 'bar' => 'foo'], '->getMany() gets many keys in one call');
 
         $cache->clean();
     }
diff --git a/test/unit/cache/sfCacheTest.php b/test/unit/cache/sfCacheTest.php
index 4f6dfe76f..f7f395908 100644
--- a/test/unit/cache/sfCacheTest.php
+++ b/test/unit/cache/sfCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class myCache extends sfCache
+class myCache extends \sfCache
 {
     public function get($key, $default = null)
     {
@@ -28,7 +29,7 @@ public function remove($key)
     {
     }
 
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
     }
 
@@ -49,10 +50,10 @@ class fakeCache
 {
 }
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // ->initialize()
 $t->diag('->initialize()');
-$cache = new myCache();
-$cache->initialize(array('foo' => 'bar'));
+$cache = new \myCache();
+$cache->initialize(['foo' => 'bar']);
 $t->is($cache->getOption('foo'), 'bar', '->initialize() takes an array of options as its first argument');
diff --git a/test/unit/cache/sfEAcceleratorCacheTest.php b/test/unit/cache/sfEAcceleratorCacheTest.php
index eec5da301..731cc7160 100644
--- a/test/unit/cache/sfEAcceleratorCacheTest.php
+++ b/test/unit/cache/sfEAcceleratorCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,11 +12,11 @@
 require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 64;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 try {
-    new sfEAcceleratorCache();
-} catch (sfInitializationException $e) {
+    new \sfEAcceleratorCache();
+} catch (\sfInitializationException $e) {
     $t->skip($e->getMessage(), $plan);
 
     return;
@@ -24,11 +25,11 @@
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
-sfConfig::set('sf_logging_enabled', false);
+\sfConfig::set('sf_logging_enabled', false);
 
 // ->initialize()
 $t->diag('->initialize()');
-$cache = new sfEAcceleratorCache();
+$cache = new \sfEAcceleratorCache();
 $cache->initialize();
 
-sfCacheDriverTests::launch($t, $cache);
+\sfCacheDriverTests::launch($t, $cache);
diff --git a/test/unit/cache/sfFileCacheTest.php b/test/unit/cache/sfFileCacheTest.php
index 5b01fc803..846405626 100644
--- a/test/unit/cache/sfFileCacheTest.php
+++ b/test/unit/cache/sfFileCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,10 +13,10 @@
 
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
-$t = new lime_test(65);
+$t = new \lime_test(65);
 
 // setup
-sfConfig::set('sf_logging_enabled', false);
+\sfConfig::set('sf_logging_enabled', false);
 $temp = tempnam('/tmp/cache_dir', 'tmp');
 unlink($temp);
 mkdir($temp);
@@ -24,16 +25,16 @@
 $t->diag('->initialize()');
 
 try {
-    $cache = new sfFileCache();
+    $cache = new \sfFileCache();
     $t->fail('->initialize() throws an sfInitializationException exception if you don\'t pass a "cache_dir" parameter');
-} catch (sfInitializationException $e) {
+} catch (\sfInitializationException $e) {
     $t->pass('->initialize() throws an sfInitializationException exception if you don\'t pass a "cache_dir" parameter');
 }
 
-$cache = new sfFileCache(array('cache_dir' => $temp));
+$cache = new \sfFileCache(['cache_dir' => $temp]);
 
-sfCacheDriverTests::launch($t, $cache);
+\sfCacheDriverTests::launch($t, $cache);
 
 // teardown
-sfToolkit::clearDirectory($temp);
+\sfToolkit::clearDirectory($temp);
 rmdir($temp);
diff --git a/test/unit/cache/sfFunctionCacheTest.php b/test/unit/cache/sfFunctionCacheTest.php
index b4f5b4702..dec3b4144 100644
--- a/test/unit/cache/sfFunctionCacheTest.php
+++ b/test/unit/cache/sfFunctionCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,11 +13,11 @@
 
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
-$t = new lime_test(15);
+$t = new \lime_test(15);
 
-class sfSimpleCache extends sfCache
+class sfSimpleCache extends \sfCache
 {
-    public $data = array();
+    public $data = [];
 
     public function get($key, $default = null)
     {
@@ -35,7 +36,7 @@ public function remove($key)
 
     public function removePattern($pattern, $delimiter = ':')
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     public function has($key)
@@ -43,9 +44,9 @@ public function has($key)
         return isset($this->data[$key]);
     }
 
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
-        $this->data = array();
+        $this->data = [];
     }
 
     public function getLastModified($key)
@@ -84,27 +85,27 @@ function testFunctionCache($arg1, $arg2)
 // ->call()
 $t->diag('->call()');
 
-$cache = new sfSimpleCache();
-$functionCache = new sfFunctionCache($cache);
+$cache = new \sfSimpleCache();
+$functionCache = new \sfFunctionCache($cache);
 $result = testFunctionCache(1, 2);
 $t->is($count, 1);
-$t->is($functionCache->call('testFunctionCache', array(1, 2)), $result, '->call() works with functions');
+$t->is($functionCache->call('testFunctionCache', [1, 2]), $result, '->call() works with functions');
 $t->is($count, 2);
-$t->is($functionCache->call('testFunctionCache', array(1, 2)), $result, '->call() stores the function call in cache');
+$t->is($functionCache->call('testFunctionCache', [1, 2]), $result, '->call() stores the function call in cache');
 $t->is($count, 2);
 
-$result = testFunctionCache::test(1, 2);
-$t->is(testFunctionCache::$count, 1);
-$t->is($functionCache->call(array('testFunctionCache', 'test'), array(1, 2)), $result, '->call() works with static method calls');
-$t->is(testFunctionCache::$count, 2);
-$t->is($functionCache->call(array('testFunctionCache', 'test'), array(1, 2)), $result, '->call() stores the function call in cache');
-$t->is(testFunctionCache::$count, 2);
+$result = \testFunctionCache::test(1, 2);
+$t->is(\testFunctionCache::$count, 1);
+$t->is($functionCache->call(['testFunctionCache', 'test'], [1, 2]), $result, '->call() works with static method calls');
+$t->is(\testFunctionCache::$count, 2);
+$t->is($functionCache->call(['testFunctionCache', 'test'], [1, 2]), $result, '->call() stores the function call in cache');
+$t->is(\testFunctionCache::$count, 2);
 
-testFunctionCache::$count = 0;
-$object = new testFunctionCache();
+\testFunctionCache::$count = 0;
+$object = new \testFunctionCache();
 $result = $object->test(1, 2);
-$t->is(testFunctionCache::$count, 1);
-$t->is($functionCache->call(array($object, 'test'), array(1, 2)), $result, '->call() works with object methods');
-$t->is(testFunctionCache::$count, 2);
-$t->is($functionCache->call(array($object, 'test'), array(1, 2)), $result, '->call() stores the function call in cache');
-$t->is(testFunctionCache::$count, 2);
+$t->is(\testFunctionCache::$count, 1);
+$t->is($functionCache->call([$object, 'test'], [1, 2]), $result, '->call() works with object methods');
+$t->is(\testFunctionCache::$count, 2);
+$t->is($functionCache->call([$object, 'test'], [1, 2]), $result, '->call() stores the function call in cache');
+$t->is(\testFunctionCache::$count, 2);
diff --git a/test/unit/cache/sfMemcacheCacheTest.php b/test/unit/cache/sfMemcacheCacheTest.php
index 241f604ba..57345a725 100644
--- a/test/unit/cache/sfMemcacheCacheTest.php
+++ b/test/unit/cache/sfMemcacheCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,7 +12,7 @@
 require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 73;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!class_exists('Memcache')) {
     $t->skip('Memcache needed to run these tests', $plan);
@@ -22,7 +23,7 @@
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
-sfConfig::set('sf_logging_enabled', false);
+\sfConfig::set('sf_logging_enabled', false);
 
 // ->initialize()
 $t->diag('->initialize()');
@@ -33,17 +34,17 @@
         $memcachedHost = null;
     }
 
-    $cache = new sfMemcacheCache(array(
+    $cache = new \sfMemcacheCache([
         'storeCacheInfo' => true,
         'host' => $memcachedHost,
-    ));
-} catch (sfInitializationException $e) {
+    ]);
+} catch (\sfInitializationException $e) {
     $t->skip('Memcached must be active to run these tests', $plan);
 
     return;
 }
 
-sfCacheDriverTests::launch($t, $cache);
+\sfCacheDriverTests::launch($t, $cache);
 
 // ->remove() test for ticket #6220
 $t->diag('->remove() test for ticket #6220');
diff --git a/test/unit/cache/sfNoCacheTest.php b/test/unit/cache/sfNoCacheTest.php
index 764b5fd31..1689b21bb 100644
--- a/test/unit/cache/sfNoCacheTest.php
+++ b/test/unit/cache/sfNoCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
 // ->initialize()
 $t->diag('->initialize()');
-$cache = new sfNoCache();
+$cache = new \sfNoCache();
 
 // ->get() ->set() ->has() ->remove() ->removePattern() ->clean() ->getLastModified() ->getTimeout()
 $t->diag('->get() ->set() ->has() ->remove() ->removePattern() ->clean() ->getLastModified() ->getTimeout()');
diff --git a/test/unit/cache/sfSQLiteCacheTest.php b/test/unit/cache/sfSQLiteCacheTest.php
index e79acde67..e8e041883 100644
--- a/test/unit/cache/sfSQLiteCacheTest.php
+++ b/test/unit/cache/sfSQLiteCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +14,7 @@
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 $plan = 129;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
     $t->skip('SQLite extension not loaded, skipping tests', $plan);
@@ -22,8 +23,8 @@
 }
 
 try {
-    new sfSQLiteCache(array('database' => ':memory:'));
-} catch (sfInitializationException $e) {
+    new \sfSQLiteCache(['database' => ':memory:']);
+} catch (\sfInitializationException $e) {
     $t->skip($e->getMessage(), $plan);
 
     return;
@@ -33,20 +34,20 @@
 $t->diag('->initialize()');
 
 try {
-    $cache = new sfSQLiteCache();
+    $cache = new \sfSQLiteCache();
     $t->fail('->initialize() throws an sfInitializationException exception if you don\'t pass a "database" parameter');
-} catch (sfInitializationException $e) {
+} catch (\sfInitializationException $e) {
     $t->pass('->initialize() throws an sfInitializationException exception if you don\'t pass a "database" parameter');
 }
 
 // database in memory
-$cache = new sfSQLiteCache(array('database' => ':memory:'));
+$cache = new \sfSQLiteCache(['database' => ':memory:']);
 
-sfCacheDriverTests::launch($t, $cache);
+\sfCacheDriverTests::launch($t, $cache);
 
 // database on disk
 $database = tempnam('/tmp/cachedir', 'tmp');
 unlink($database);
-$cache = new sfSQLiteCache(array('database' => $database));
-sfCacheDriverTests::launch($t, $cache);
+$cache = new \sfSQLiteCache(['database' => $database]);
+\sfCacheDriverTests::launch($t, $cache);
 unlink($database);
diff --git a/test/unit/cache/sfXCacheCacheTest.php b/test/unit/cache/sfXCacheCacheTest.php
index e0d37b030..700c46841 100644
--- a/test/unit/cache/sfXCacheCacheTest.php
+++ b/test/unit/cache/sfXCacheCacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,11 +12,11 @@
 require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 64;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 try {
-    new sfXCacheCache();
-} catch (sfInitializationException $e) {
+    new \sfXCacheCache();
+} catch (\sfInitializationException $e) {
     $t->skip($e->getMessage(), $plan);
 
     return;
@@ -24,11 +25,11 @@
 require_once __DIR__.'/sfCacheDriverTests.class.php';
 
 // setup
-sfConfig::set('sf_logging_enabled', false);
+\sfConfig::set('sf_logging_enabled', false);
 
 // ->initialize()
 $t->diag('->initialize()');
-$cache = new sfXCacheCache();
+$cache = new \sfXCacheCache();
 $cache->initialize();
 
-sfCacheDriverTests::launch($t, $cache);
+\sfCacheDriverTests::launch($t, $cache);
diff --git a/test/unit/command/sfCommandArgumentSetTest.php b/test/unit/command/sfCommandArgumentSetTest.php
index f18712eb6..bae351419 100644
--- a/test/unit/command/sfCommandArgumentSetTest.php
+++ b/test/unit/command/sfCommandArgumentSetTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,98 +11,98 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(21);
+$t = new \lime_test(21);
 
-$foo = new sfCommandArgument('foo');
-$bar = new sfCommandArgument('bar');
-$foo1 = new sfCommandArgument('foo');
-$foo2 = new sfCommandArgument('foo2', sfCommandArgument::REQUIRED);
+$foo = new \sfCommandArgument('foo');
+$bar = new \sfCommandArgument('bar');
+$foo1 = new \sfCommandArgument('foo');
+$foo2 = new \sfCommandArgument('foo2', \sfCommandArgument::REQUIRED);
 
 // __construct()
 $t->diag('__construct()');
-$argumentSet = new sfCommandArgumentSet();
-$t->is($argumentSet->getArguments(), array(), '__construct() creates a new sfCommandArgumentSet object');
+$argumentSet = new \sfCommandArgumentSet();
+$t->is($argumentSet->getArguments(), [], '__construct() creates a new sfCommandArgumentSet object');
 
-$argumentSet = new sfCommandArgumentSet(array($foo, $bar));
-$t->is($argumentSet->getArguments(), array('foo' => $foo, 'bar' => $bar), '__construct() takes an array of sfCommandArgument objects as its first argument');
+$argumentSet = new \sfCommandArgumentSet([$foo, $bar]);
+$t->is($argumentSet->getArguments(), ['foo' => $foo, 'bar' => $bar], '__construct() takes an array of sfCommandArgument objects as its first argument');
 
 // ->setArguments()
 $t->diag('->setArguments()');
-$argumentSet = new sfCommandArgumentSet();
-$argumentSet->setArguments(array($foo));
-$t->is($argumentSet->getArguments(), array('foo' => $foo), '->setArguments() sets the array of sfCommandArgument objects');
-$argumentSet->setArguments(array($bar));
+$argumentSet = new \sfCommandArgumentSet();
+$argumentSet->setArguments([$foo]);
+$t->is($argumentSet->getArguments(), ['foo' => $foo], '->setArguments() sets the array of sfCommandArgument objects');
+$argumentSet->setArguments([$bar]);
 
-$t->is($argumentSet->getArguments(), array('bar' => $bar), '->setArguments() clears all sfCommandArgument objects');
+$t->is($argumentSet->getArguments(), ['bar' => $bar], '->setArguments() clears all sfCommandArgument objects');
 
 // ->addArguments()
 $t->diag('->addArguments()');
-$argumentSet = new sfCommandArgumentSet();
-$argumentSet->addArguments(array($foo));
-$t->is($argumentSet->getArguments(), array('foo' => $foo), '->addArguments() adds an array of sfCommandArgument objects');
-$argumentSet->addArguments(array($bar));
-$t->is($argumentSet->getArguments(), array('foo' => $foo, 'bar' => $bar), '->addArguments() does not clear existing sfCommandArgument objects');
+$argumentSet = new \sfCommandArgumentSet();
+$argumentSet->addArguments([$foo]);
+$t->is($argumentSet->getArguments(), ['foo' => $foo], '->addArguments() adds an array of sfCommandArgument objects');
+$argumentSet->addArguments([$bar]);
+$t->is($argumentSet->getArguments(), ['foo' => $foo, 'bar' => $bar], '->addArguments() does not clear existing sfCommandArgument objects');
 
 // ->addArgument()
 $t->diag('->addArgument()');
-$argumentSet = new sfCommandArgumentSet();
+$argumentSet = new \sfCommandArgumentSet();
 $argumentSet->addArgument($foo);
-$t->is($argumentSet->getArguments(), array('foo' => $foo), '->addArgument() adds a sfCommandArgument object');
+$t->is($argumentSet->getArguments(), ['foo' => $foo], '->addArgument() adds a sfCommandArgument object');
 $argumentSet->addArgument($bar);
-$t->is($argumentSet->getArguments(), array('foo' => $foo, 'bar' => $bar), '->addArgument() adds a sfCommandArgument object');
+$t->is($argumentSet->getArguments(), ['foo' => $foo, 'bar' => $bar], '->addArgument() adds a sfCommandArgument object');
 
 // arguments must have different names
 try {
     $argumentSet->addArgument($foo1);
     $t->fail('->addArgument() throws a sfCommandException if another argument is already registered with the same name');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->addArgument() throws a sfCommandException if another argument is already registered with the same name');
 }
 
 // cannot add a parameter after an array parameter
-$argumentSet->addArgument(new sfCommandArgument('fooarray', sfCommandArgument::IS_ARRAY));
+$argumentSet->addArgument(new \sfCommandArgument('fooarray', \sfCommandArgument::IS_ARRAY));
 
 try {
-    $argumentSet->addArgument(new sfCommandArgument('anotherbar'));
+    $argumentSet->addArgument(new \sfCommandArgument('anotherbar'));
     $t->fail('->addArgument() throws a sfCommandException if there is an array parameter already registered');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->addArgument() throws a sfCommandException if there is an array parameter already registered');
 }
 
 // cannot add a required argument after an optional one
-$argumentSet = new sfCommandArgumentSet();
+$argumentSet = new \sfCommandArgumentSet();
 $argumentSet->addArgument($foo);
 
 try {
     $argumentSet->addArgument($foo2);
     $t->fail('->addArgument() throws an exception if you try to add a required argument after an optional one');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->addArgument() throws an exception if you try to add a required argument after an optional one');
 }
 
 // ->getArgument()
 $t->diag('->getArgument()');
-$argumentSet = new sfCommandArgumentSet();
-$argumentSet->addArguments(array($foo));
+$argumentSet = new \sfCommandArgumentSet();
+$argumentSet->addArguments([$foo]);
 $t->is($argumentSet->getArgument('foo'), $foo, '->getArgument() returns a sfCommandArgument by its name');
 
 try {
     $argumentSet->getArgument('bar');
     $t->fail('->getArgument() throws an exception if the Argument name does not exist');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->getArgument() throws an exception if the Argument name does not exist');
 }
 
 // ->hasArgument()
 $t->diag('->hasArgument()');
-$argumentSet = new sfCommandArgumentSet();
-$argumentSet->addArguments(array($foo));
+$argumentSet = new \sfCommandArgumentSet();
+$argumentSet->addArguments([$foo]);
 $t->is($argumentSet->hasArgument('foo'), true, '->hasArgument() returns true if a sfCommandArgument exists for the given name');
 $t->is($argumentSet->hasArgument('bar'), false, '->hasArgument() returns false if a sfCommandArgument exists for the given name');
 
 // ->getArgumentRequiredCount()
 $t->diag('->getArgumentRequiredCount()');
-$argumentSet = new sfCommandArgumentSet();
+$argumentSet = new \sfCommandArgumentSet();
 $argumentSet->addArgument($foo2);
 $t->is($argumentSet->getArgumentRequiredCount(), 1, '->getArgumentRequiredCount() returns the number of required arguments');
 $argumentSet->addArgument($foo);
@@ -109,7 +110,7 @@
 
 // ->getArgumentCount()
 $t->diag('->getArgumentCount()');
-$argumentSet = new sfCommandArgumentSet();
+$argumentSet = new \sfCommandArgumentSet();
 $argumentSet->addArgument($foo2);
 $t->is($argumentSet->getArgumentCount(), 1, '->getArgumentCount() returns the number of arguments');
 $argumentSet->addArgument($foo);
@@ -117,17 +118,17 @@
 
 // ->getDefaults()
 $t->diag('->getDefaults()');
-$argumentSet = new sfCommandArgumentSet();
-$argumentSet->addArguments(array(
-    new sfCommandArgument('foo1', sfCommandArgument::OPTIONAL),
-    new sfCommandArgument('foo2', sfCommandArgument::OPTIONAL, '', 'default'),
-    new sfCommandArgument('foo3', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY),
+$argumentSet = new \sfCommandArgumentSet();
+$argumentSet->addArguments([
+    new \sfCommandArgument('foo1', \sfCommandArgument::OPTIONAL),
+    new \sfCommandArgument('foo2', \sfCommandArgument::OPTIONAL, '', 'default'),
+    new \sfCommandArgument('foo3', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY),
     //  new sfCommandArgument('foo4', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, '', array(1, 2)),
-));
-$t->is($argumentSet->getDefaults(), array('foo1' => null, 'foo2' => 'default', 'foo3' => array()), '->getDefaults() return the default values for each argument');
-
-$argumentSet = new sfCommandArgumentSet();
-$argumentSet->addArguments(array(
-    new sfCommandArgument('foo4', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, '', array(1, 2)),
-));
-$t->is($argumentSet->getDefaults(), array('foo4' => array(1, 2)), '->getDefaults() return the default values for each argument');
+]);
+$t->is($argumentSet->getDefaults(), ['foo1' => null, 'foo2' => 'default', 'foo3' => []], '->getDefaults() return the default values for each argument');
+
+$argumentSet = new \sfCommandArgumentSet();
+$argumentSet->addArguments([
+    new \sfCommandArgument('foo4', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY, '', [1, 2]),
+]);
+$t->is($argumentSet->getDefaults(), ['foo4' => [1, 2]], '->getDefaults() return the default values for each argument');
diff --git a/test/unit/command/sfCommandArgumentTest.php b/test/unit/command/sfCommandArgumentTest.php
index 97ea2f8a2..f7f4144e3 100644
--- a/test/unit/command/sfCommandArgumentTest.php
+++ b/test/unit/command/sfCommandArgumentTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,76 +11,76 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(16);
+$t = new \lime_test(16);
 
 // __construct()
 $t->diag('__construct()');
-$argument = new sfCommandArgument('foo');
+$argument = new \sfCommandArgument('foo');
 $t->is($argument->getName(), 'foo', '__construct() takes a name as its first argument');
 
 // mode argument
-$argument = new sfCommandArgument('foo');
+$argument = new \sfCommandArgument('foo');
 $t->is($argument->isRequired(), false, '__construct() gives a "sfCommandArgument::OPTIONAL" mode by default');
 
-$argument = new sfCommandArgument('foo', null);
+$argument = new \sfCommandArgument('foo', null);
 $t->is($argument->isRequired(), false, '__construct() can take "sfCommandArgument::OPTIONAL" as its mode');
 
-$argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL);
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL);
 $t->is($argument->isRequired(), false, '__construct() can take "sfCommandArgument::PARAMETER_OPTIONAL" as its mode');
 
-$argument = new sfCommandArgument('foo', sfCommandArgument::REQUIRED);
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::REQUIRED);
 $t->is($argument->isRequired(), true, '__construct() can take "sfCommandArgument::PARAMETER_REQUIRED" as its mode');
 
 try {
-    $argument = new sfCommandArgument('foo', 'ANOTHER_ONE');
+    $argument = new \sfCommandArgument('foo', 'ANOTHER_ONE');
     $t->fail('__construct() throws an sfCommandException if the mode is not valid');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('__construct() throws an sfCommandException if the mode is not valid');
 }
 
 // ->isArray()
 $t->diag('->isArray()');
-$argument = new sfCommandArgument('foo', sfCommandArgument::IS_ARRAY);
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::IS_ARRAY);
 $t->ok($argument->isArray(), '->isArray() returns true if the argument can be an array');
-$argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY);
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY);
 $t->ok($argument->isArray(), '->isArray() returns true if the argument can be an array');
-$argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL);
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL);
 $t->ok(!$argument->isArray(), '->isArray() returns false if the argument can not be an array');
 
 // ->getHelp()
 $t->diag('->getHelp()');
-$argument = new sfCommandArgument('foo', null, 'Some help');
+$argument = new \sfCommandArgument('foo', null, 'Some help');
 $t->is($argument->getHelp(), 'Some help', '->getHelp() return the message help');
 
 // ->getDefault()
 $t->diag('->getDefault()');
-$argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL, '', 'default');
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL, '', 'default');
 $t->is($argument->getDefault(), 'default', '->getDefault() return the default value');
 
 // ->setDefault()
 $t->diag('->setDefault()');
-$argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL, '', 'default');
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL, '', 'default');
 $argument->setDefault(null);
 $t->ok(null === $argument->getDefault(), '->setDefault() can reset the default value by passing null');
 $argument->setDefault('another');
 $t->is($argument->getDefault(), 'another', '->setDefault() changes the default value');
 
-$argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY);
-$argument->setDefault(array(1, 2));
-$t->is($argument->getDefault(), array(1, 2), '->setDefault() changes the default value');
+$argument = new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY);
+$argument->setDefault([1, 2]);
+$t->is($argument->getDefault(), [1, 2], '->setDefault() changes the default value');
 
 try {
-    $argument = new sfCommandArgument('foo', sfCommandArgument::REQUIRED);
+    $argument = new \sfCommandArgument('foo', \sfCommandArgument::REQUIRED);
     $argument->setDefault('default');
     $t->fail('->setDefault() throws an sfCommandException if you give a default value for a required argument');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->setDefault() throws an sfCommandException if you give a default value for a required argument');
 }
 
 try {
-    $argument = new sfCommandArgument('foo', sfCommandArgument::IS_ARRAY);
+    $argument = new \sfCommandArgument('foo', \sfCommandArgument::IS_ARRAY);
     $argument->setDefault('default');
     $t->fail('->setDefault() throws an sfCommandException if you give a default value which is not an array for a IS_ARRAY option');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->setDefault() throws an sfCommandException if you give a default value which is not an array for a IS_ARRAY option');
 }
diff --git a/test/unit/command/sfCommandManagerTest.php b/test/unit/command/sfCommandManagerTest.php
index 2e78ff6e8..0b2b76000 100644
--- a/test/unit/command/sfCommandManagerTest.php
+++ b/test/unit/command/sfCommandManagerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,60 +11,60 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(41);
+$t = new \lime_test(41);
 
 // __construct()
 $t->diag('__construct()');
-$argumentSet = new sfCommandArgumentSet();
-$optionSet = new sfCommandOptionSet();
+$argumentSet = new \sfCommandArgumentSet();
+$optionSet = new \sfCommandOptionSet();
 
-$manager = new sfCommandManager();
+$manager = new \sfCommandManager();
 $t->isa_ok($manager->getArgumentSet(), 'sfCommandArgumentSet', '__construct() creates a new sfCommandArgumentsSet if none given');
 $t->isa_ok($manager->getOptionSet(), 'sfCommandOptionSet', '__construct() creates a new sfCommandOptionSet if none given');
 
-$manager = new sfCommandManager($argumentSet);
+$manager = new \sfCommandManager($argumentSet);
 $t->is($manager->getArgumentSet(), $argumentSet, '__construct() takes a sfCommandArgumentSet as its first argument');
 $t->isa_ok($manager->getOptionSet(), 'sfCommandOptionSet', '__construct() takes a sfCommandArgumentSet as its first argument');
 
-$manager = new sfCommandManager($argumentSet, $optionSet);
+$manager = new \sfCommandManager($argumentSet, $optionSet);
 $t->is($manager->getOptionSet(), $optionSet, '__construct() can take a sfCommandOptionSet as its second argument');
 
 // ->setArgumentSet() ->getArgumentSet()
 $t->diag('->setArgumentSet() ->getArgumentSet()');
-$manager = new sfCommandManager(new sfCommandArgumentSet());
-$argumentSet = new sfCommandArgumentSet();
+$manager = new \sfCommandManager(new \sfCommandArgumentSet());
+$argumentSet = new \sfCommandArgumentSet();
 $manager->setArgumentSet($argumentSet);
 $t->is($manager->getArgumentSet(), $argumentSet, '->setArgumentSet() sets the manager argument set');
 
 // ->setOptionSet() ->getOptionSet()
 $t->diag('->setOptionSet() ->getOptionSet()');
-$manager = new sfCommandManager(new sfCommandArgumentSet());
-$optionSet = new sfCommandOptionSet();
+$manager = new \sfCommandManager(new \sfCommandArgumentSet());
+$optionSet = new \sfCommandOptionSet();
 $manager->setOptionSet($optionSet);
 $t->is($manager->getOptionSet(), $optionSet, '->setOptionSet() sets the manager option set');
 
 // ->process()
 $t->diag('->process()');
-$argumentSet = new sfCommandArgumentSet(array(
-    new sfCommandArgument('foo1', sfCommandArgument::REQUIRED),
-    new sfCommandArgument('foo2', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY),
-));
-$optionSet = new sfCommandOptionSet(array(
-    new sfCommandOption('foo1', null, sfCommandOption::PARAMETER_NONE),
-    new sfCommandOption('foo2', 'f', sfCommandOption::PARAMETER_NONE),
-    new sfCommandOption('foo3', null, sfCommandOption::PARAMETER_OPTIONAL, '', 'default3'),
-    new sfCommandOption('foo4', null, sfCommandOption::PARAMETER_OPTIONAL, '', 'default4'),
-    new sfCommandOption('foo5', null, sfCommandOption::PARAMETER_OPTIONAL, '', 'default5'),
-    new sfCommandOption('foo6', 'r', sfCommandOption::PARAMETER_REQUIRED, '', 'default5'),
-    new sfCommandOption('foo7', 't', sfCommandOption::PARAMETER_REQUIRED, '', 'default7'),
-    new sfCommandOption('foo8', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY),
-    new sfCommandOption('foo9', 's', sfCommandOption::PARAMETER_OPTIONAL, '', 'default9'),
-    new sfCommandOption('foo10', 'u', sfCommandOption::PARAMETER_OPTIONAL, '', 'default10'),
-    new sfCommandOption('foo11', 'v', sfCommandOption::PARAMETER_OPTIONAL, '', 'default11'),
-));
-$manager = new sfCommandManager($argumentSet, $optionSet);
+$argumentSet = new \sfCommandArgumentSet([
+    new \sfCommandArgument('foo1', \sfCommandArgument::REQUIRED),
+    new \sfCommandArgument('foo2', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY),
+]);
+$optionSet = new \sfCommandOptionSet([
+    new \sfCommandOption('foo1', null, \sfCommandOption::PARAMETER_NONE),
+    new \sfCommandOption('foo2', 'f', \sfCommandOption::PARAMETER_NONE),
+    new \sfCommandOption('foo3', null, \sfCommandOption::PARAMETER_OPTIONAL, '', 'default3'),
+    new \sfCommandOption('foo4', null, \sfCommandOption::PARAMETER_OPTIONAL, '', 'default4'),
+    new \sfCommandOption('foo5', null, \sfCommandOption::PARAMETER_OPTIONAL, '', 'default5'),
+    new \sfCommandOption('foo6', 'r', \sfCommandOption::PARAMETER_REQUIRED, '', 'default5'),
+    new \sfCommandOption('foo7', 't', \sfCommandOption::PARAMETER_REQUIRED, '', 'default7'),
+    new \sfCommandOption('foo8', null, \sfCommandOption::PARAMETER_REQUIRED | \sfCommandOption::IS_ARRAY),
+    new \sfCommandOption('foo9', 's', \sfCommandOption::PARAMETER_OPTIONAL, '', 'default9'),
+    new \sfCommandOption('foo10', 'u', \sfCommandOption::PARAMETER_OPTIONAL, '', 'default10'),
+    new \sfCommandOption('foo11', 'v', \sfCommandOption::PARAMETER_OPTIONAL, '', 'default11'),
+]);
+$manager = new \sfCommandManager($argumentSet, $optionSet);
 $manager->process('--foo1 -f --foo3 --foo4="foo4" --foo5=foo5 -r"foo6 foo6" -t foo7 --foo8="foo" --foo8=bar -s -u foo10 -vfoo11 foo1 foo2 foo3 foo4');
-$options = array(
+$options = [
     'foo1' => true,
     'foo2' => true,
     'foo3' => 'default3',
@@ -71,15 +72,15 @@
     'foo5' => 'foo5',
     'foo6' => 'foo6 foo6',
     'foo7' => 'foo7',
-    'foo8' => array('foo', 'bar'),
+    'foo8' => ['foo', 'bar'],
     'foo9' => 'default9',
     'foo10' => 'foo10',
     'foo11' => 'foo11',
-);
-$arguments = array(
+];
+$arguments = [
     'foo1' => 'foo1',
-    'foo2' => array('foo2', 'foo3', 'foo4'),
-);
+    'foo2' => ['foo2', 'foo3', 'foo4'],
+];
 $t->ok($manager->isValid(), '->process() processes CLI options');
 $t->is($manager->getOptionValues(), $options, '->process() processes CLI options');
 $t->is($manager->getArgumentValues(), $arguments, '->process() processes CLI options');
@@ -93,7 +94,7 @@
 try {
     $manager->getOptionValue('nonexistant');
     $t->fail('->getOptionValue() throws a sfCommandException if the option name does not exist');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->getOptionValue() throws a sfCommandException if the option name does not exist');
 }
 
@@ -106,53 +107,53 @@
 try {
     $manager->getArgumentValue('nonexistant');
     $t->fail('->getArgumentValue() throws a sfCommandException if the argument name does not exist');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->getArgumentValue() throws a sfCommandException if the argument name does not exist');
 }
 
 // ->isValid() ->getErrors()
 $t->diag('->isValid() ->getErrors()');
-$argumentSet = new sfCommandArgumentSet();
-$manager = new sfCommandManager($argumentSet);
+$argumentSet = new \sfCommandArgumentSet();
+$manager = new \sfCommandManager($argumentSet);
 $manager->process('foo');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$argumentSet = new sfCommandArgumentSet(array(new sfCommandArgument('foo', sfCommandArgument::REQUIRED)));
-$manager = new sfCommandManager($argumentSet);
+$argumentSet = new \sfCommandArgumentSet([new \sfCommandArgument('foo', \sfCommandArgument::REQUIRED)]);
+$manager = new \sfCommandManager($argumentSet);
 $manager->process('');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$optionSet = new sfCommandOptionSet(array(new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED)));
-$manager = new sfCommandManager(null, $optionSet);
+$optionSet = new \sfCommandOptionSet([new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_REQUIRED)]);
+$manager = new \sfCommandManager(null, $optionSet);
 $manager->process('--foo');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$optionSet = new sfCommandOptionSet(array(new sfCommandOption('foo', 'f', sfCommandOption::PARAMETER_REQUIRED)));
-$manager = new sfCommandManager(null, $optionSet);
+$optionSet = new \sfCommandOptionSet([new \sfCommandOption('foo', 'f', \sfCommandOption::PARAMETER_REQUIRED)]);
+$manager = new \sfCommandManager(null, $optionSet);
 $manager->process('-f');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$optionSet = new sfCommandOptionSet(array(new sfCommandOption('foo', null, sfCommandOption::PARAMETER_NONE)));
-$manager = new sfCommandManager(null, $optionSet);
+$optionSet = new \sfCommandOptionSet([new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_NONE)]);
+$manager = new \sfCommandManager(null, $optionSet);
 $manager->process('--foo="bar"');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$manager = new sfCommandManager();
+$manager = new \sfCommandManager();
 $manager->process('--bar');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$manager = new sfCommandManager();
+$manager = new \sfCommandManager();
 $manager->process('-b');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
 
-$manager = new sfCommandManager();
+$manager = new \sfCommandManager();
 $manager->process('--bar="foo"');
 $t->ok(!$manager->isValid(), '->isValid() returns false if the options are not valid');
 $t->is(count($manager->getErrors()), 1, '->getErrors() returns an array of errors');
diff --git a/test/unit/command/sfCommandOptionSetTest.php b/test/unit/command/sfCommandOptionSetTest.php
index b69f523cc..1640f8179 100644
--- a/test/unit/command/sfCommandOptionSetTest.php
+++ b/test/unit/command/sfCommandOptionSetTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,125 +11,125 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(20);
+$t = new \lime_test(20);
 
-$foo = new sfCommandOption('foo', 'f');
-$bar = new sfCommandOption('bar', 'b');
-$foo1 = new sfCommandOption('fooBis', 'f');
-$foo2 = new sfCommandOption('foo', 'p');
+$foo = new \sfCommandOption('foo', 'f');
+$bar = new \sfCommandOption('bar', 'b');
+$foo1 = new \sfCommandOption('fooBis', 'f');
+$foo2 = new \sfCommandOption('foo', 'p');
 
 // __construct()
 $t->diag('__construct()');
-$optionSet = new sfCommandOptionSet();
-$t->is($optionSet->getOptions(), array(), '__construct() creates a new sfCommandOptionSet object');
+$optionSet = new \sfCommandOptionSet();
+$t->is($optionSet->getOptions(), [], '__construct() creates a new sfCommandOptionSet object');
 
-$optionSet = new sfCommandOptionSet(array($foo, $bar));
-$t->is($optionSet->getOptions(), array('foo' => $foo, 'bar' => $bar), '__construct() takes an array of sfCommandOption objects as its first argument');
+$optionSet = new \sfCommandOptionSet([$foo, $bar]);
+$t->is($optionSet->getOptions(), ['foo' => $foo, 'bar' => $bar], '__construct() takes an array of sfCommandOption objects as its first argument');
 
 // ->setOptions()
 $t->diag('->setOptions()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->setOptions(array($foo));
-$t->is($optionSet->getOptions(), array('foo' => $foo), '->setOptions() sets the array of sfCommandOption objects');
-$optionSet->setOptions(array($bar));
-$t->is($optionSet->getOptions(), array('bar' => $bar), '->setOptions() clears all sfCommandOption objects');
+$optionSet = new \sfCommandOptionSet();
+$optionSet->setOptions([$foo]);
+$t->is($optionSet->getOptions(), ['foo' => $foo], '->setOptions() sets the array of sfCommandOption objects');
+$optionSet->setOptions([$bar]);
+$t->is($optionSet->getOptions(), ['bar' => $bar], '->setOptions() clears all sfCommandOption objects');
 
 try {
     $optionSet->getOptionForShortcut('f');
     $t->fail('->setOptions() clears all sfCommandOption objects');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->setOptions() clears all sfCommandOption objects');
 }
 
 // ->addOptions()
 $t->diag('->addOptions()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->addOptions(array($foo));
-$t->is($optionSet->getOptions(), array('foo' => $foo), '->addOptions() adds an array of sfCommandOption objects');
-$optionSet->addOptions(array($bar));
-$t->is($optionSet->getOptions(), array('foo' => $foo, 'bar' => $bar), '->addOptions() does not clear existing sfCommandOption objects');
+$optionSet = new \sfCommandOptionSet();
+$optionSet->addOptions([$foo]);
+$t->is($optionSet->getOptions(), ['foo' => $foo], '->addOptions() adds an array of sfCommandOption objects');
+$optionSet->addOptions([$bar]);
+$t->is($optionSet->getOptions(), ['foo' => $foo, 'bar' => $bar], '->addOptions() does not clear existing sfCommandOption objects');
 
 // ->addOption()
 $t->diag('->addOption()');
-$optionSet = new sfCommandOptionSet();
+$optionSet = new \sfCommandOptionSet();
 $optionSet->addOption($foo);
-$t->is($optionSet->getOptions(), array('foo' => $foo), '->addOption() adds a sfCommandOption object');
+$t->is($optionSet->getOptions(), ['foo' => $foo], '->addOption() adds a sfCommandOption object');
 $optionSet->addOption($bar);
-$t->is($optionSet->getOptions(), array('foo' => $foo, 'bar' => $bar), '->addOption() adds a sfCommandOption object');
+$t->is($optionSet->getOptions(), ['foo' => $foo, 'bar' => $bar], '->addOption() adds a sfCommandOption object');
 
 try {
     $optionSet->addOption($foo2);
     $t->fail('->addOption() throws a sfCommandException if the another option is already registered with the same name');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->addOption() throws a sfCommandException if the another option is already registered with the same name');
 }
 
 try {
     $optionSet->addOption($foo1);
     $t->fail('->addOption() throws a sfCommandException if the another option is already registered with the same shortcut');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->addOption() throws a sfCommandException if the another option is already registered with the same shortcut');
 }
 
 // ->getOption()
 $t->diag('->getOption()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->addOptions(array($foo));
+$optionSet = new \sfCommandOptionSet();
+$optionSet->addOptions([$foo]);
 $t->is($optionSet->getOption('foo'), $foo, '->getOption() returns a sfCommandOption by its name');
 
 try {
     $optionSet->getOption('bar');
     $t->fail('->getOption() throws an exception if the option name does not exist');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->getOption() throws an exception if the option name does not exist');
 }
 
 // ->hasOption()
 $t->diag('->hasOption()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->addOptions(array($foo));
+$optionSet = new \sfCommandOptionSet();
+$optionSet->addOptions([$foo]);
 $t->is($optionSet->hasOption('foo'), true, '->hasOption() returns true if a sfCommandOption exists for the given name');
 $t->is($optionSet->hasOption('bar'), false, '->hasOption() returns false if a sfCommandOption exists for the given name');
 
 // ->hasShortcut()
 $t->diag('->hasShortcut()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->addOptions(array($foo));
+$optionSet = new \sfCommandOptionSet();
+$optionSet->addOptions([$foo]);
 $t->is($optionSet->hasShortcut('f'), true, '->hasShortcut() returns true if a sfCommandOption exists for the given shortcut');
 $t->is($optionSet->hasShortcut('b'), false, '->hasShortcut() returns false if a sfCommandOption exists for the given shortcut');
 
 // ->getOptionForShortcut()
 $t->diag('->getOptionForShortcut()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->addOptions(array($foo));
+$optionSet = new \sfCommandOptionSet();
+$optionSet->addOptions([$foo]);
 $t->is($optionSet->getOptionForShortcut('f'), $foo, '->getOptionForShortcut() returns a sfCommandOption by its shortcut');
 
 try {
     $optionSet->getOptionForShortcut('l');
     $t->fail('->getOption() throws an exception if the shortcut does not exist');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->getOption() throws an exception if the shortcut does not exist');
 }
 
 // ->getDefaults()
 $t->diag('->getDefaults()');
-$optionSet = new sfCommandOptionSet();
-$optionSet->addOptions(array(
-    new sfCommandOption('foo1', null, sfCommandOption::PARAMETER_NONE),
-    new sfCommandOption('foo2', null, sfCommandOption::PARAMETER_REQUIRED),
-    new sfCommandOption('foo3', null, sfCommandOption::PARAMETER_REQUIRED, '', 'default'),
-    new sfCommandOption('foo4', null, sfCommandOption::PARAMETER_OPTIONAL),
-    new sfCommandOption('foo5', null, sfCommandOption::PARAMETER_OPTIONAL, '', 'default'),
-    new sfCommandOption('foo6', null, sfCommandOption::PARAMETER_OPTIONAL | sfCommandOption::IS_ARRAY),
-    new sfCommandOption('foo7', null, sfCommandOption::PARAMETER_OPTIONAL | sfCommandOption::IS_ARRAY, '', array(1, 2)),
-));
-$defaults = array(
+$optionSet = new \sfCommandOptionSet();
+$optionSet->addOptions([
+    new \sfCommandOption('foo1', null, \sfCommandOption::PARAMETER_NONE),
+    new \sfCommandOption('foo2', null, \sfCommandOption::PARAMETER_REQUIRED),
+    new \sfCommandOption('foo3', null, \sfCommandOption::PARAMETER_REQUIRED, '', 'default'),
+    new \sfCommandOption('foo4', null, \sfCommandOption::PARAMETER_OPTIONAL),
+    new \sfCommandOption('foo5', null, \sfCommandOption::PARAMETER_OPTIONAL, '', 'default'),
+    new \sfCommandOption('foo6', null, \sfCommandOption::PARAMETER_OPTIONAL | \sfCommandOption::IS_ARRAY),
+    new \sfCommandOption('foo7', null, \sfCommandOption::PARAMETER_OPTIONAL | \sfCommandOption::IS_ARRAY, '', [1, 2]),
+]);
+$defaults = [
     'foo1' => null,
     'foo2' => null,
     'foo3' => 'default',
     'foo4' => null,
     'foo5' => 'default',
-    'foo6' => array(),
-    'foo7' => array(1, 2),
-);
+    'foo6' => [],
+    'foo7' => [1, 2],
+];
 $t->is($optionSet->getDefaults(), $defaults, '->getDefaults() returns the default values for all options');
diff --git a/test/unit/command/sfCommandOptionTest.php b/test/unit/command/sfCommandOptionTest.php
index 8a8cc8e53..4b37eee09 100644
--- a/test/unit/command/sfCommandOptionTest.php
+++ b/test/unit/command/sfCommandOptionTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,109 +11,109 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(34);
+$t = new \lime_test(34);
 
 // __construct()
 $t->diag('__construct()');
-$option = new sfCommandOption('foo');
+$option = new \sfCommandOption('foo');
 $t->is($option->getName(), 'foo', '__construct() takes a name as its first argument');
-$option = new sfCommandOption('--foo');
+$option = new \sfCommandOption('--foo');
 $t->is($option->getName(), 'foo', '__construct() removes the leading -- of the option name');
 
 // shortcut argument
-$option = new sfCommandOption('foo', 'f');
+$option = new \sfCommandOption('foo', 'f');
 $t->is($option->getShortcut(), 'f', '__construct() can take a shortcut as its second argument');
-$option = new sfCommandOption('foo', '-f');
+$option = new \sfCommandOption('foo', '-f');
 $t->is($option->getShortcut(), 'f', '__construct() removes the leading - of the shortcut');
 
 // mode argument
-$option = new sfCommandOption('foo', 'f');
+$option = new \sfCommandOption('foo', 'f');
 $t->is($option->acceptParameter(), false, '__construct() gives a "sfCommandOption::PARAMETER_NONE" mode by default');
 $t->is($option->isParameterRequired(), false, '__construct() gives a "sfCommandOption::PARAMETER_NONE" mode by default');
 $t->is($option->isParameterOptional(), false, '__construct() gives a "sfCommandOption::PARAMETER_NONE" mode by default');
 
-$option = new sfCommandOption('foo', 'f', null);
+$option = new \sfCommandOption('foo', 'f', null);
 $t->is($option->acceptParameter(), false, '__construct() can take "sfCommandOption::PARAMETER_NONE" as its mode');
 $t->is($option->isParameterRequired(), false, '__construct() can take "sfCommandOption::PARAMETER_NONE" as its mode');
 $t->is($option->isParameterOptional(), false, '__construct() can take "sfCommandOption::PARAMETER_NONE" as its mode');
 
-$option = new sfCommandOption('foo', 'f', sfCommandOption::PARAMETER_NONE);
+$option = new \sfCommandOption('foo', 'f', \sfCommandOption::PARAMETER_NONE);
 $t->is($option->acceptParameter(), false, '__construct() can take "sfCommandOption::PARAMETER_NONE" as its mode');
 $t->is($option->isParameterRequired(), false, '__construct() can take "sfCommandOption::PARAMETER_NONE" as its mode');
 $t->is($option->isParameterOptional(), false, '__construct() can take "sfCommandOption::PARAMETER_NONE" as its mode');
 
-$option = new sfCommandOption('foo', 'f', sfCommandOption::PARAMETER_REQUIRED);
+$option = new \sfCommandOption('foo', 'f', \sfCommandOption::PARAMETER_REQUIRED);
 $t->is($option->acceptParameter(), true, '__construct() can take "sfCommandOption::PARAMETER_REQUIRED" as its mode');
 $t->is($option->isParameterRequired(), true, '__construct() can take "sfCommandOption::PARAMETER_REQUIRED" as its mode');
 $t->is($option->isParameterOptional(), false, '__construct() can take "sfCommandOption::PARAMETER_REQUIRED" as its mode');
 
-$option = new sfCommandOption('foo', 'f', sfCommandOption::PARAMETER_OPTIONAL);
+$option = new \sfCommandOption('foo', 'f', \sfCommandOption::PARAMETER_OPTIONAL);
 $t->is($option->acceptParameter(), true, '__construct() can take "sfCommandOption::PARAMETER_OPTIONAL" as its mode');
 $t->is($option->isParameterRequired(), false, '__construct() can take "sfCommandOption::PARAMETER_OPTIONAL" as its mode');
 $t->is($option->isParameterOptional(), true, '__construct() can take "sfCommandOption::PARAMETER_OPTIONAL" as its mode');
 
 try {
-    $option = new sfCommandOption('foo', 'f', 'ANOTHER_ONE');
+    $option = new \sfCommandOption('foo', 'f', 'ANOTHER_ONE');
     $t->fail('__construct() throws an sfCommandException if the mode is not valid');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('__construct() throws an sfCommandException if the mode is not valid');
 }
 
 // ->isArray()
 $t->diag('->isArray()');
-$option = new sfCommandOption('foo', null, sfCommandOption::IS_ARRAY);
+$option = new \sfCommandOption('foo', null, \sfCommandOption::IS_ARRAY);
 $t->ok($option->isArray(), '->isArray() returns true if the option can be an array');
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_NONE | sfCommandOption::IS_ARRAY);
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_NONE | \sfCommandOption::IS_ARRAY);
 $t->ok($option->isArray(), '->isArray() returns true if the option can be an array');
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_NONE);
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_NONE);
 $t->ok(!$option->isArray(), '->isArray() returns false if the option can not be an array');
 
 // ->getHelp()
 $t->diag('->getHelp()');
-$option = new sfCommandOption('foo', 'f', null, 'Some help');
+$option = new \sfCommandOption('foo', 'f', null, 'Some help');
 $t->is($option->getHelp(), 'Some help', '->getHelp() returns the help message');
 
 // ->getDefault()
 $t->diag('->getDefault()');
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_OPTIONAL, '', 'default');
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_OPTIONAL, '', 'default');
 $t->is($option->getDefault(), 'default', '->getDefault() returns the default value');
 
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED, '', 'default');
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_REQUIRED, '', 'default');
 $t->is($option->getDefault(), 'default', '->getDefault() returns the default value');
 
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED);
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_REQUIRED);
 $t->ok(null === $option->getDefault(), '->getDefault() returns null if no default value is configured');
 
-$option = new sfCommandOption('foo', null, sfCommandOption::IS_ARRAY);
-$t->is($option->getDefault(), array(), '->getDefault() returns an empty array if option is an array');
+$option = new \sfCommandOption('foo', null, \sfCommandOption::IS_ARRAY);
+$t->is($option->getDefault(), [], '->getDefault() returns an empty array if option is an array');
 
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_NONE);
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_NONE);
 $t->ok(false === $option->getDefault(), '->getDefault() returns false if the option does not take a parameter');
 
 // ->setDefault()
 $t->diag('->setDefault()');
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED, '', 'default');
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_REQUIRED, '', 'default');
 $option->setDefault(null);
 $t->ok(null === $option->getDefault(), '->setDefault() can reset the default value by passing null');
 $option->setDefault('another');
 $t->is($option->getDefault(), 'another', '->setDefault() changes the default value');
 
-$option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY);
-$option->setDefault(array(1, 2));
-$t->is($option->getDefault(), array(1, 2), '->setDefault() changes the default value');
+$option = new \sfCommandOption('foo', null, \sfCommandOption::PARAMETER_REQUIRED | \sfCommandOption::IS_ARRAY);
+$option->setDefault([1, 2]);
+$t->is($option->getDefault(), [1, 2], '->setDefault() changes the default value');
 
 try {
-    $option = new sfCommandOption('foo', 'f', sfCommandOption::PARAMETER_NONE);
+    $option = new \sfCommandOption('foo', 'f', \sfCommandOption::PARAMETER_NONE);
     $option->setDefault('default');
     $t->fail('->setDefault() throws an sfCommandException if you give a default value for a PARAMETER_NONE option');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->setDefault() throws an sfCommandException if you give a default value for a PARAMETER_NONE option');
 }
 
 try {
-    $option = new sfCommandOption('foo', 'f', sfCommandOption::IS_ARRAY);
+    $option = new \sfCommandOption('foo', 'f', \sfCommandOption::IS_ARRAY);
     $option->setDefault('default');
     $t->fail('->setDefault() throws an sfCommandException if you give a default value which is not an array for a IS_ARRAY option');
-} catch (sfCommandException $e) {
+} catch (\sfCommandException $e) {
     $t->pass('->setDefault() throws an sfCommandException if you give a default value which is not an array for a IS_ARRAY option');
 }
diff --git a/test/unit/config/sfCompileConfigHandlerTest.php b/test/unit/config/sfCompileConfigHandlerTest.php
index eb21987f4..cd211bf31 100644
--- a/test/unit/config/sfCompileConfigHandlerTest.php
+++ b/test/unit/config/sfCompileConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,19 +11,19 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$handler = new sfCompileConfigHandler();
+$handler = new \sfCompileConfigHandler();
 $handler->initialize();
 
 $dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfCompileConfigHandler'.DIRECTORY_SEPARATOR;
 
 $t->diag('execute');
 
-sfConfig::set('sf_debug', true);
-$data = $handler->execute(array($dir.'simple.yml'));
-$t->ok(false !== strpos($data, "class sfInflector\n{\n    /**"), '->execute() return complete classe codes');
+\sfConfig::set('sf_debug', true);
+$data = $handler->execute([$dir.'simple.yml']);
+$t->ok(str_contains($data, "class sfInflector\n{\n    /**"), '->execute() return complete classe codes');
 
-sfConfig::set('sf_debug', false);
-$data = $handler->execute(array($dir.'simple.yml'));
-$t->ok(false !== strpos($data, "class sfInflector\n{\n    public"), '->execute() return minified classe codes');
+\sfConfig::set('sf_debug', false);
+$data = $handler->execute([$dir.'simple.yml']);
+$t->ok(str_contains($data, "class sfInflector\n{\n    public"), '->execute() return minified classe codes');
diff --git a/test/unit/config/sfConfigHandlerTest.php b/test/unit/config/sfConfigHandlerTest.php
index f04a4d2c8..13b2f752d 100644
--- a/test/unit/config/sfConfigHandlerTest.php
+++ b/test/unit/config/sfConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,38 +11,38 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
-class myConfigHandler extends sfConfigHandler
+class myConfigHandler extends \sfConfigHandler
 {
     public function execute($configFiles)
     {
     }
 }
 
-$config = new myConfigHandler();
+$config = new \myConfigHandler();
 $config->initialize();
 
 // ->initialize()
 $t->diag('->initialize()');
-$config->initialize(array('foo' => 'bar'));
+$config->initialize(['foo' => 'bar']);
 $t->is($config->getParameterHolder()->get('foo'), 'bar', '->initialize() takes an array of parameters as its first argument');
 
 // ::replaceConstants()
 $t->diag('::replaceConstants()');
-sfConfig::set('foo', 'bar');
-$t->is(sfConfigHandler::replaceConstants('my value with a %foo% constant'), 'my value with a bar constant', '::replaceConstants() replaces constants enclosed in %');
+\sfConfig::set('foo', 'bar');
+$t->is(\sfConfigHandler::replaceConstants('my value with a %foo% constant'), 'my value with a bar constant', '::replaceConstants() replaces constants enclosed in %');
 
-$t->is(sfConfigHandler::replaceConstants('%Y/%m/%d %H:%M'), '%Y/%m/%d %H:%M', '::replaceConstants() does not replace unknown constants');
+$t->is(\sfConfigHandler::replaceConstants('%Y/%m/%d %H:%M'), '%Y/%m/%d %H:%M', '::replaceConstants() does not replace unknown constants');
 
-sfConfig::set('foo', 'bar');
-$value = array(
+\sfConfig::set('foo', 'bar');
+$value = [
     'foo' => 'my value with a %foo% constant',
-    'bar' => array(
+    'bar' => [
         'foo' => 'my value with a %foo% constant',
-    ),
-);
-$value = sfConfigHandler::replaceConstants($value);
+    ],
+];
+$value = \sfConfigHandler::replaceConstants($value);
 $t->is($value['foo'], 'my value with a bar constant', '::replaceConstants() replaces constants in arrays recursively');
 $t->is($value['bar']['foo'], 'my value with a bar constant', '::replaceConstants() replaces constants in arrays recursively');
 
@@ -51,6 +52,6 @@ public function execute($configFiles)
 
 // ->replacePath()
 $t->diag('->replacePath()');
-sfConfig::set('sf_app_dir', 'ROOTDIR');
+\sfConfig::set('sf_app_dir', 'ROOTDIR');
 $t->is($config->replacePath('test'), 'ROOTDIR/test', '->replacePath() prefix a relative path with "sf_app_dir"');
 $t->is($config->replacePath('/test'), '/test', '->replacePath() prefix a relative path with "sf_app_dir"');
diff --git a/test/unit/config/sfConfigTest.php b/test/unit/config/sfConfigTest.php
index bf2f53e17..214c78034 100644
--- a/test/unit/config/sfConfigTest.php
+++ b/test/unit/config/sfConfigTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,44 +11,44 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
 // ::get() ::set()
 $t->diag('::get() ::set()');
-sfConfig::clear();
+\sfConfig::clear();
 
-sfConfig::set('foo', 'bar');
-$t->is(sfConfig::get('foo'), 'bar', '::get() returns the value of key config');
-$t->is(sfConfig::get('foo1', 'default_value'), 'default_value', '::get() takes a default value as its second argument');
+\sfConfig::set('foo', 'bar');
+$t->is(\sfConfig::get('foo'), 'bar', '::get() returns the value of key config');
+$t->is(\sfConfig::get('foo1', 'default_value'), 'default_value', '::get() takes a default value as its second argument');
 
 // ::has()
 $t->diag('::has()');
-sfConfig::clear();
-$t->is(sfConfig::has('foo'), false, '::has() returns false if the key config does not exist');
-sfConfig::set('foo', 'bar');
-$t->is(sfConfig::has('foo'), true, '::has() returns true if the key config exists');
+\sfConfig::clear();
+$t->is(\sfConfig::has('foo'), false, '::has() returns false if the key config does not exist');
+\sfConfig::set('foo', 'bar');
+$t->is(\sfConfig::has('foo'), true, '::has() returns true if the key config exists');
 
 // ::add()
 $t->diag('::add()');
-sfConfig::clear();
+\sfConfig::clear();
 
-sfConfig::set('foo', 'bar');
-sfConfig::set('foo1', 'foo1');
-sfConfig::add(array('foo' => 'foo', 'bar' => 'bar'));
+\sfConfig::set('foo', 'bar');
+\sfConfig::set('foo1', 'foo1');
+\sfConfig::add(['foo' => 'foo', 'bar' => 'bar']);
 
-$t->is(sfConfig::get('foo'), 'foo', '::add() adds an array of config parameters');
-$t->is(sfConfig::get('bar'), 'bar', '::add() adds an array of config parameters');
-$t->is(sfConfig::get('foo1'), 'foo1', '::add() adds an array of config parameters');
+$t->is(\sfConfig::get('foo'), 'foo', '::add() adds an array of config parameters');
+$t->is(\sfConfig::get('bar'), 'bar', '::add() adds an array of config parameters');
+$t->is(\sfConfig::get('foo1'), 'foo1', '::add() adds an array of config parameters');
 
 // ::getAll()
 $t->diag('::getAll()');
-sfConfig::clear();
-sfConfig::set('foo', 'bar');
-sfConfig::set('foo1', 'foo1');
+\sfConfig::clear();
+\sfConfig::set('foo', 'bar');
+\sfConfig::set('foo1', 'foo1');
 
-$t->is(sfConfig::getAll(), array('foo' => 'bar', 'foo1' => 'foo1'), '::getAll() returns all config parameters');
+$t->is(\sfConfig::getAll(), ['foo' => 'bar', 'foo1' => 'foo1'], '::getAll() returns all config parameters');
 
 // ::clear()
 $t->diag('::clear()');
-sfConfig::clear();
-$t->is(sfConfig::get('foo1'), null, '::clear() removes all config parameters');
+\sfConfig::clear();
+$t->is(\sfConfig::get('foo1'), null, '::clear() removes all config parameters');
diff --git a/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php b/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
index a7c17841f..380f2e29c 100644
--- a/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
+++ b/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,22 +11,22 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
+\sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // prefix
-$handler = new sfDefineEnvironmentConfigHandler();
-$handler->initialize(array('prefix' => 'sf_'));
+$handler = new \sfDefineEnvironmentConfigHandler();
+$handler->initialize(['prefix' => 'sf_']);
 
 $dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfDefineEnvironmentConfigHandler'.DIRECTORY_SEPARATOR;
 
-$files = array(
+$files = [
     $dir.'prefix_default.yml',
     $dir.'prefix_all.yml',
-);
+];
 
-sfConfig::set('sf_environment', 'prod');
+\sfConfig::set('sf_environment', 'prod');
 
 $data = $handler->execute($files);
 $data = preg_replace('#date\: \d+/\d+/\d+ \d+\:\d+\:\d+#', '', $data);
diff --git a/test/unit/config/sfFilterConfigHandlerTest.php b/test/unit/config/sfFilterConfigHandlerTest.php
index 14b42ef29..8753e5120 100644
--- a/test/unit/config/sfFilterConfigHandlerTest.php
+++ b/test/unit/config/sfFilterConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,80 +11,80 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
-$handler = new sfFilterConfigHandler();
+$handler = new \sfFilterConfigHandler();
 $handler->initialize();
 
 $dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfFilterConfigHandler'.DIRECTORY_SEPARATOR;
 
 // parse errors
 $t->diag('parse errors');
-$files = array(
+$files = [
     $dir.'no_class.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('filters.yml must have a "class" section for each filter entry');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->like($e->getMessage(), '/with missing class key/', 'filters.yml must have a "class" section for each filter entry');
 }
 
 // no execution/rendering filter
-foreach (array('execution', 'rendering') as $key) {
-    $files = array(
+foreach (['execution', 'rendering'] as $key) {
+    $files = [
         $dir.sprintf('no_%s.yml', $key),
-    );
+    ];
 
     try {
         $data = $handler->execute($files);
         $t->fail(sprintf('filters.yml must have a filter of type "%s"', $key));
-    } catch (sfParseException $e) {
+    } catch (\sfParseException $e) {
         $t->like($e->getMessage(), sprintf('/must register a filter of type "%s"/', $key), sprintf('filters.yml must have a filter of type "%s"', $key));
     }
 }
 
 // filter inheritance
 $t->diag('filter inheritance');
-$files = array(
+$files = [
     $dir.'default_filters.yml',
     $dir.'not_disabled.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('filters.yml must keep all filters when inheriting from a master filters configuration file');
-} catch (sfConfigurationException $e) {
+} catch (\sfConfigurationException $e) {
     $t->like($e->getMessage(), '/but not present/', 'filters.yml must keep all filters when inheriting from a master filters configuration file');
 }
 
 // disabling a filter
 $t->diag('disabling a filter');
-$files = array(
+$files = [
     $dir.'disable.yml',
-);
+];
 
 $t->unlike($handler->execute($files), '/defaultFilterClass/', 'you can disable a filter by settings "enabled" to false');
 
 // condition support
 $t->diag('condition support');
-$files = array(
+$files = [
     $dir.'condition.yml',
-);
+];
 
-sfConfig::set('default_test', true);
+\sfConfig::set('default_test', true);
 $t->like($handler->execute($files), '/defaultFilterClass/', 'you can add a "condition" key to the filter parameters');
 
-sfConfig::set('default_test', false);
+\sfConfig::set('default_test', false);
 $t->unlike($handler->execute($files), '/defaultFilterClass/', 'you can add a "condition" key to the filter parameters');
 
 // usual configuration
 $t->diag('usual configuration');
-$files = array(
+$files = [
     $dir.'default_filters.yml',
     $dir.'filters.yml',
-);
+];
 
 $data = $handler->execute($files);
 $data = preg_replace('#date\: \d+/\d+/\d+ \d+\:\d+\:\d+\n#', '', $data);
diff --git a/test/unit/config/sfGeneratorConfigHandlerTest.php b/test/unit/config/sfGeneratorConfigHandlerTest.php
index 864427f7b..1e1ad10d9 100644
--- a/test/unit/config/sfGeneratorConfigHandlerTest.php
+++ b/test/unit/config/sfGeneratorConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,72 +11,72 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
+\sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
 
-$t = new lime_test(5);
+$t = new \lime_test(5);
 
-$handler = new sfGeneratorConfigHandler();
+$handler = new \sfGeneratorConfigHandler();
 $handler->initialize();
 
 $dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfGeneratorConfigHandler'.DIRECTORY_SEPARATOR;
 
 $t->diag('parse errors');
-$files = array(
+$files = [
     $dir.'empty.yml',
     $dir.'no_generator_class.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('generator.yml must have a "class" section');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->like($e->getMessage(), '/must specify a generator class section under the generator section/', 'generator.yml must have a "class" section');
 }
 
-$files = array(
+$files = [
     $dir.'empty.yml',
     $dir.'no_generator_section.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('generator.yml must have a "generator" section');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->like($e->getMessage(), '/must specify a generator section/', 'generator.yml must have a "generator" section');
 }
 
-$files = array(
+$files = [
     $dir.'empty.yml',
     $dir.'root_fields_section.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('generator.yml can have a "fields" section but only under "param"');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->like($e->getMessage(), '/can specify a "fields" section but only under the param section/', 'generator.yml can have a "fields" section but only under "param"');
 }
 
-$files = array(
+$files = [
     $dir.'empty.yml',
     $dir.'root_list_section.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('generator.yml can have a "list" section but only under "param"');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->like($e->getMessage(), '/can specify a "list" section but only under the param section/', 'generator.yml can have a "list" section but only under "param"');
 }
 
-$files = array(
+$files = [
     $dir.'empty.yml',
     $dir.'root_edit_section.yml',
-);
+];
 
 try {
     $data = $handler->execute($files);
     $t->fail('generator.yml can have a "edit" section but only under "param"');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->like($e->getMessage(), '/can specify a "edit" section but only under the param section/', 'generator.yml can have a "edit" section but only under "param"');
 }
diff --git a/test/unit/config/sfPluginConfigurationTest.php b/test/unit/config/sfPluginConfigurationTest.php
index 565305711..c156d2efe 100644
--- a/test/unit/config/sfPluginConfigurationTest.php
+++ b/test/unit/config/sfPluginConfigurationTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,9 +16,9 @@
 
 require_once $pluginRoot.'/config/sfAutoloadPluginConfiguration.class.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
     public function setup()
     {
@@ -28,8 +29,8 @@ public function setup()
 // ->guessRootDir() ->guessName()
 $t->diag('->guessRootDir() ->guessName()');
 
-$configuration = new sfProjectConfiguration($rootDir);
-$pluginConfig = new sfAutoloadPluginConfiguration($configuration);
+$configuration = new \sfProjectConfiguration($rootDir);
+$pluginConfig = new \sfAutoloadPluginConfiguration($configuration);
 
 $t->is($pluginConfig->getRootDir(), $pluginRoot, '->guessRootDir() guesses plugin root directory');
 $t->is($pluginConfig->getName(), 'sfAutoloadPlugin', '->guessName() guesses plugin name');
@@ -38,39 +39,39 @@ public function setup()
 $t->diag('->filterTestFiles()');
 
 // test:all
-$task = new sfTestAllTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array(), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestAllTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => [], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 6, '->filterTestFiles() adds all plugin tests');
 
 // test:functional
-$task = new sfTestFunctionalTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array('controller' => array()), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestFunctionalTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => ['controller' => []], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 3, '->filterTestFiles() adds functional plugin tests');
 
-$task = new sfTestFunctionalTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array('controller' => array('BarFunctional')), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestFunctionalTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => ['controller' => ['BarFunctional']], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 1, '->filterTestFiles() adds functional plugin tests when a controller is specified');
 
-$task = new sfTestFunctionalTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array('controller' => array('nested/NestedFunctional')), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestFunctionalTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => ['controller' => ['nested/NestedFunctional']], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 1, '->filterTestFiles() adds functional plugin tests when a nested controller is specified');
 
 // test:unit
-$task = new sfTestUnitTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array('name' => array()), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestUnitTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => ['name' => []], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 3, '->filterTestFiles() adds unit plugin tests');
 
-$task = new sfTestUnitTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array('name' => array('FooUnit')), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestUnitTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => ['name' => ['FooUnit']], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 1, '->filterTestFiles() adds unit plugin tests when a name is specified');
 
-$task = new sfTestUnitTask($configuration->getEventDispatcher(), new sfFormatter());
-$event = new sfEvent($task, 'task.test.filter_test_files', array('arguments' => array('name' => array('nested/NestedUnit')), 'options' => array()));
-$files = $pluginConfig->filterTestFiles($event, array());
+$task = new \sfTestUnitTask($configuration->getEventDispatcher(), new \sfFormatter());
+$event = new \sfEvent($task, 'task.test.filter_test_files', ['arguments' => ['name' => ['nested/NestedUnit']], 'options' => []]);
+$files = $pluginConfig->filterTestFiles($event, []);
 $t->is(count($files), 1, '->filterTestFiles() adds unit plugin tests when a nested name is specified');
diff --git a/test/unit/config/sfProjectConfigurationTest.php b/test/unit/config/sfProjectConfigurationTest.php
index 0cd354d20..cc4e9787a 100644
--- a/test/unit/config/sfProjectConfigurationTest.php
+++ b/test/unit/config/sfProjectConfigurationTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,32 +11,32 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
     public function setup()
     {
-        $this->enablePlugins(array('sfAutoloadPlugin', 'sfConfigPlugin'));
+        $this->enablePlugins(['sfAutoloadPlugin', 'sfConfigPlugin']);
         $this->setPluginPath('sfConfigPlugin', $this->rootDir.'/lib/plugins/sfConfigPlugin');
     }
 }
 
-$configuration = new ProjectConfiguration(__DIR__.'/../../functional/fixtures');
+$configuration = new \ProjectConfiguration(__DIR__.'/../../functional/fixtures');
 
 // ->setPlugins() ->disablePlugins() ->enablePlugins() ->enableAllPluginsExcept()
 $t->diag('->setPlugins() ->disablePlugins() ->enablePlugins() ->enableAllPluginsExcept()');
 
-foreach (array('setPlugins', 'disablePlugins', 'enablePlugins', 'enableAllPluginsExcept') as $method) {
+foreach (['setPlugins', 'disablePlugins', 'enablePlugins', 'enableAllPluginsExcept'] as $method) {
     try {
-        $configuration->{$method}(array());
+        $configuration->{$method}([]);
         $t->fail('->'.$method.'() throws an exception if called too late');
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
         $t->pass('->'.$method.'() throws an exception if called too late');
     }
 }
 
-class ProjectConfiguration2 extends sfProjectConfiguration
+class ProjectConfiguration2 extends \sfProjectConfiguration
 {
     public function setup()
     {
@@ -43,13 +44,13 @@ public function setup()
     }
 }
 
-$configuration = new ProjectConfiguration2(__DIR__.'/../../functional/fixtures');
-$t->is_deeply($configuration->getPlugins(), array('sfAutoloadPlugin', 'sfConfigPlugin'), '->enablePlugins() can enable plugins passed as arguments instead of array');
+$configuration = new \ProjectConfiguration2(__DIR__.'/../../functional/fixtures');
+$t->is_deeply($configuration->getPlugins(), ['sfAutoloadPlugin', 'sfConfigPlugin'], '->enablePlugins() can enable plugins passed as arguments instead of array');
 
 // ->__construct()
 $t->diag('->__construct()');
 
-class ProjectConfiguration3 extends sfProjectConfiguration
+class ProjectConfiguration3 extends \sfProjectConfiguration
 {
     public function setup()
     {
@@ -58,8 +59,8 @@ public function setup()
 }
 
 try {
-    $configuration = new ProjectConfiguration3(__DIR__.'/../../functional/fixtures');
+    $configuration = new \ProjectConfiguration3(__DIR__.'/../../functional/fixtures');
     $t->fail('->__construct() throws an exception if a non-existant plugin is enabled');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->__construct() throws an exception if a non-existant plugin is enabled');
 }
diff --git a/test/unit/config/sfSimpleYamlConfigHandlerTest.php b/test/unit/config/sfSimpleYamlConfigHandlerTest.php
index 6a596290d..f51cd6e12 100644
--- a/test/unit/config/sfSimpleYamlConfigHandlerTest.php
+++ b/test/unit/config/sfSimpleYamlConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,17 +11,17 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$config = new sfSimpleYamlConfigHandler();
+$config = new \sfSimpleYamlConfigHandler();
 $config->initialize();
 
 $dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfSimpleYamlConfigHandler'.DIRECTORY_SEPARATOR;
 
-$array = get_retval($config, array($dir.'config.yml'));
+$array = get_retval($config, [$dir.'config.yml']);
 $t->is($array['article']['title'], 'foo', '->execute() returns configuration file as an array');
 
-$array = get_retval($config, array($dir.'config.yml', $dir.'config_bis.yml'));
+$array = get_retval($config, [$dir.'config.yml', $dir.'config_bis.yml']);
 $t->is($array['article']['title'], 'bar', '->execute() returns configuration file as an array');
 
 function get_retval($config, $files)
diff --git a/test/unit/config/sfViewConfigHandlerTest.php b/test/unit/config/sfViewConfigHandlerTest.php
index d6b24160d..ab1dd94ca 100644
--- a/test/unit/config/sfViewConfigHandlerTest.php
+++ b/test/unit/config/sfViewConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(22);
+$t = new \lime_test(22);
 
-class myViewConfigHandler extends sfViewConfigHandler
+class myViewConfigHandler extends \sfViewConfigHandler
 {
     public function setConfiguration($config)
     {
@@ -25,49 +26,49 @@ public function addHtmlAsset($viewName = '')
     }
 }
 
-$handler = new myViewConfigHandler();
+$handler = new \myViewConfigHandler();
 
 // addHtmlAsset() basic asset addition
 $t->diag('addHtmlAsset() basic asset addition');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'stylesheets' => array('foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'stylesheets' => ['foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('foobar', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds stylesheets to the response');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'stylesheets' => array(array('foobar' => array('position' => 'last'))),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'stylesheets' => [['foobar' => ['position' => 'last']]],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('foobar', 'last', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds stylesheets to the response');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'javascripts' => array('foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'javascripts' => ['foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('foobar', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds JavaScript to the response');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'javascripts' => array(array('foobar' => array('position' => 'last'))),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'javascripts' => [['foobar' => ['position' => 'last']]],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('foobar', 'last', array ());
 
@@ -77,14 +78,14 @@ public function addHtmlAsset($viewName = '')
 // Insertion order for stylesheets
 $t->diag('addHtmlAsset() insertion order for stylesheets');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'stylesheets' => array('foobar'),
-    ),
-    'all' => array(
-        'stylesheets' => array('all_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'stylesheets' => ['foobar'],
+    ],
+    'all' => [
+        'stylesheets' => ['all_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('all_foobar', '', array ());
   $response->addStylesheet('foobar', '', array ());
@@ -92,14 +93,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific stylesheets after application-wide assets');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'stylesheets' => array('all_foobar'),
-    ),
-    'myView' => array(
-        'stylesheets' => array('foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'stylesheets' => ['all_foobar'],
+    ],
+    'myView' => [
+        'stylesheets' => ['foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('all_foobar', '', array ());
   $response->addStylesheet('foobar', '', array ());
@@ -107,14 +108,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific stylesheets after application-wide assets');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'stylesheets' => array('foobar'),
-    ),
-    'default' => array(
-        'stylesheets' => array('default_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'stylesheets' => ['foobar'],
+    ],
+    'default' => [
+        'stylesheets' => ['default_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('default_foobar', '', array ());
   $response->addStylesheet('foobar', '', array ());
@@ -122,14 +123,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific stylesheets after default assets');
 
-$handler->setConfiguration(array(
-    'default' => array(
-        'stylesheets' => array('default_foobar'),
-    ),
-    'myView' => array(
-        'stylesheets' => array('foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'default' => [
+        'stylesheets' => ['default_foobar'],
+    ],
+    'myView' => [
+        'stylesheets' => ['foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('default_foobar', '', array ());
   $response->addStylesheet('foobar', '', array ());
@@ -137,14 +138,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific stylesheets after default assets');
 
-$handler->setConfiguration(array(
-    'default' => array(
-        'stylesheets' => array('default_foobar'),
-    ),
-    'all' => array(
-        'stylesheets' => array('all_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'default' => [
+        'stylesheets' => ['default_foobar'],
+    ],
+    'all' => [
+        'stylesheets' => ['all_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('default_foobar', '', array ());
   $response->addStylesheet('all_foobar', '', array ());
@@ -152,14 +153,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds application-specific stylesheets after default assets');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'stylesheets' => array('all_foobar'),
-    ),
-    'default' => array(
-        'stylesheets' => array('default_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'stylesheets' => ['all_foobar'],
+    ],
+    'default' => [
+        'stylesheets' => ['default_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('default_foobar', '', array ());
   $response->addStylesheet('all_foobar', '', array ());
@@ -170,14 +171,14 @@ public function addHtmlAsset($viewName = '')
 // Insertion order for javascripts
 $t->diag('addHtmlAsset() insertion order for javascripts');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'javascripts' => array('foobar'),
-    ),
-    'all' => array(
-        'javascripts' => array('all_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'javascripts' => ['foobar'],
+    ],
+    'all' => [
+        'javascripts' => ['all_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('all_foobar', '', array ());
   $response->addJavascript('foobar', '', array ());
@@ -185,14 +186,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific javascripts after application-wide assets');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'javascripts' => array('all_foobar'),
-    ),
-    'myView' => array(
-        'javascripts' => array('foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'javascripts' => ['all_foobar'],
+    ],
+    'myView' => [
+        'javascripts' => ['foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('all_foobar', '', array ());
   $response->addJavascript('foobar', '', array ());
@@ -200,14 +201,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific javascripts after application-wide assets');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'javascripts' => array('foobar'),
-    ),
-    'default' => array(
-        'javascripts' => array('default_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'javascripts' => ['foobar'],
+    ],
+    'default' => [
+        'javascripts' => ['default_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('default_foobar', '', array ());
   $response->addJavascript('foobar', '', array ());
@@ -215,14 +216,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific javascripts after default assets');
 
-$handler->setConfiguration(array(
-    'default' => array(
-        'javascripts' => array('default_foobar'),
-    ),
-    'myView' => array(
-        'javascripts' => array('foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'default' => [
+        'javascripts' => ['default_foobar'],
+    ],
+    'myView' => [
+        'javascripts' => ['foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('default_foobar', '', array ());
   $response->addJavascript('foobar', '', array ());
@@ -230,14 +231,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds view-specific javascripts after default assets');
 
-$handler->setConfiguration(array(
-    'default' => array(
-        'javascripts' => array('default_foobar'),
-    ),
-    'all' => array(
-        'javascripts' => array('all_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'default' => [
+        'javascripts' => ['default_foobar'],
+    ],
+    'all' => [
+        'javascripts' => ['all_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('default_foobar', '', array ());
   $response->addJavascript('all_foobar', '', array ());
@@ -245,14 +246,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() adds application-specific javascripts after default assets');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'javascripts' => array('all_foobar'),
-    ),
-    'default' => array(
-        'javascripts' => array('default_foobar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'javascripts' => ['all_foobar'],
+    ],
+    'default' => [
+        'javascripts' => ['default_foobar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('default_foobar', '', array ());
   $response->addJavascript('all_foobar', '', array ());
@@ -263,14 +264,14 @@ public function addHtmlAsset($viewName = '')
 // removal of assets
 $t->diag('addHtmlAsset() removal of assets');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'stylesheets' => array('all_foo', 'all_bar'),
-    ),
-    'myView' => array(
-        'stylesheets' => array('foobar', '-all_bar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'stylesheets' => ['all_foo', 'all_bar'],
+    ],
+    'myView' => [
+        'stylesheets' => ['foobar', '-all_bar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('all_foo', '', array ());
   $response->addStylesheet('foobar', '', array ());
@@ -278,14 +279,14 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() supports the - option to remove one stylesheet previously added');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'javascripts' => array('all_foo', 'all_bar'),
-    ),
-    'myView' => array(
-        'javascripts' => array('foobar', '-all_bar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'javascripts' => ['all_foo', 'all_bar'],
+    ],
+    'myView' => [
+        'javascripts' => ['foobar', '-all_bar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('all_foo', '', array ());
   $response->addJavascript('foobar', '', array ());
@@ -293,56 +294,56 @@ public function addHtmlAsset($viewName = '')
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() supports the - option to remove one javascript previously added');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'stylesheets' => array('foo', 'bar', '-*', 'baz'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'stylesheets' => ['foo', 'bar', '-*', 'baz'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('baz', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() supports the -* option to remove all stylesheets previously added');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'javascripts' => array('foo', 'bar', '-*', 'baz'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'javascripts' => ['foo', 'bar', '-*', 'baz'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addJavascript('baz', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() supports the -* option to remove all javascripts previously added');
 
-$handler->setConfiguration(array(
-    'all' => array(
-        'stylesheets' => array('-*', 'foobar'),
-    ),
-    'default' => array(
-        'stylesheets' => array('default_foo', 'default_bar'),
-    ),
-));
+$handler->setConfiguration([
+    'all' => [
+        'stylesheets' => ['-*', 'foobar'],
+    ],
+    'default' => [
+        'stylesheets' => ['default_foo', 'default_bar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('foobar', '', array ());
 
 EOF;
 $t->is(fix_linebreaks($handler->addHtmlAsset('myView')), fix_linebreaks($content), 'addHtmlAsset() supports the -* option to remove all assets previously added');
 
-$handler->setConfiguration(array(
-    'myView' => array(
-        'stylesheets' => array('foobar', '-*', 'bar'),
-        'javascripts' => array('foobar', '-*', 'bar'),
-    ),
-    'all' => array(
-        'stylesheets' => array('all_foo', 'all_foofoo', 'all_barbar'),
-        'javascripts' => array('all_foo', 'all_foofoo', 'all_barbar'),
-    ),
-    'default' => array(
-        'stylesheets' => array('default_foo', 'default_foofoo', 'default_barbar'),
-        'javascripts' => array('default_foo', 'default_foofoo', 'default_barbar'),
-    ),
-));
+$handler->setConfiguration([
+    'myView' => [
+        'stylesheets' => ['foobar', '-*', 'bar'],
+        'javascripts' => ['foobar', '-*', 'bar'],
+    ],
+    'all' => [
+        'stylesheets' => ['all_foo', 'all_foofoo', 'all_barbar'],
+        'javascripts' => ['all_foo', 'all_foofoo', 'all_barbar'],
+    ],
+    'default' => [
+        'stylesheets' => ['default_foo', 'default_foofoo', 'default_barbar'],
+        'javascripts' => ['default_foo', 'default_foofoo', 'default_barbar'],
+    ],
+]);
 $content = <<<'EOF'
   $response->addStylesheet('bar', '', array ());
   $response->addJavascript('bar', '', array ());
diff --git a/test/unit/config/sfYamlConfigHandlerTest.php b/test/unit/config/sfYamlConfigHandlerTest.php
index caf09e976..833649741 100644
--- a/test/unit/config/sfYamlConfigHandlerTest.php
+++ b/test/unit/config/sfYamlConfigHandlerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
-class myConfigHandler extends sfYamlConfigHandler
+class myConfigHandler extends \sfYamlConfigHandler
 {
     public $yamlConfig;
 
@@ -41,7 +42,7 @@ public function getConfigValue($keyName, $category, $defaultValue = null)
     }
 }
 
-$config = new myConfigHandler();
+$config = new \myConfigHandler();
 $config->initialize();
 
 // ->parseYamls()
@@ -52,20 +53,20 @@ public function getConfigValue($keyName, $category, $defaultValue = null)
 
 // ->mergeConfigValue()
 $t->diag('->mergeConfigValue()');
-$config->yamlConfig = array(
-    'bar' => array(
-        'foo' => array(
+$config->yamlConfig = [
+    'bar' => [
+        'foo' => [
             'foo' => 'foobar',
             'bar' => 'bar',
-        ),
-    ),
-    'all' => array(
-        'foo' => array(
+        ],
+    ],
+    'all' => [
+        'foo' => [
             'foo' => 'fooall',
             'barall' => 'barall',
-        ),
-    ),
-);
+        ],
+    ],
+];
 $values = $config->mergeConfigValue('foo', 'bar');
 $t->is($values['foo'], 'foobar', '->mergeConfigValue() merges values for a given key under a given category');
 $t->is($values['bar'], 'bar', '->mergeConfigValue() merges values for a given key under a given category');
@@ -73,14 +74,14 @@ public function getConfigValue($keyName, $category, $defaultValue = null)
 
 // ->getConfigValue()
 $t->diag('->getConfigValue()');
-$config->yamlConfig = array(
-    'bar' => array(
+$config->yamlConfig = [
+    'bar' => [
         'foo' => 'foobar',
-    ),
-    'all' => array(
+    ],
+    'all' => [
         'foo' => 'fooall',
-    ),
-);
+    ],
+];
 $t->is($config->getConfigValue('foo', 'bar'), 'foobar', '->getConfigValue() returns the value for the key in the given category');
 $t->is($config->getConfigValue('foo', 'all'), 'fooall', '->getConfigValue() returns the value for the key in the given category');
 $t->is($config->getConfigValue('foo', 'foofoo'), 'fooall', '->getConfigValue() returns the value for the key in the "all" category if the key does not exist in the given category');
diff --git a/test/unit/controller/sfControllerTest.php b/test/unit/controller/sfControllerTest.php
index 4ab303491..6fbd8477d 100644
--- a/test/unit/controller/sfControllerTest.php
+++ b/test/unit/controller/sfControllerTest.php
@@ -1,10 +1,11 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license information, please controller the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
@@ -12,20 +13,20 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-class myController extends sfController
+class myController extends \sfController
 {
     public function execute()
     {
     }
 }
 
-$context = sfContext::getInstance();
+$context = \sfContext::getInstance();
 
-$controller = new myController($context);
+$controller = new \myController($context);
 
 // new methods via sfEventDispatcher
 require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
-$dispatcherTest = new sfEventDispatcherTest($t);
+$dispatcherTest = new \sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($context->getEventDispatcher(), $controller, 'controller');
diff --git a/test/unit/controller/sfWebControllerTest.php b/test/unit/controller/sfWebControllerTest.php
index 9b90bb709..f89a8bf86 100644
--- a/test/unit/controller/sfWebControllerTest.php
+++ b/test/unit/controller/sfWebControllerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,9 +15,9 @@
 
 require_once $_test_dir.'/unit/sfNoRouting.class.php';
 
-$t = new lime_test(21);
+$t = new \lime_test(21);
 
-class myWebResponse extends sfWebResponse
+class myWebResponse extends \sfWebResponse
 {
     public function sendHttpHeaders()
     {
@@ -29,129 +30,129 @@ public function send()
 
 $_SERVER['HTTP_HOST'] = 'localhost';
 $_SERVER['SCRIPT_NAME'] = '/index.php';
-sfConfig::set('sf_max_forwards', 10);
-$context = sfContext::getInstance(array(
+\sfConfig::set('sf_max_forwards', 10);
+$context = \sfContext::getInstance([
     'routing' => 'sfNoRouting',
     'request' => 'sfWebRequest',
     'response' => 'myWebResponse',
-));
+]);
 
-$controller = new sfFrontWebController($context, null);
+$controller = new \sfFrontWebController($context, null);
 
-$tests = array(
-    'module/action' => array(
+$tests = [
+    'module/action' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
-        ),
-    ),
-    'module/action?id=12' => array(
+        ],
+    ],
+    'module/action?id=12' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'id' => 12,
-        ),
-    ),
-    'module/action?id=12&' => array(
+        ],
+    ],
+    'module/action?id=12&' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'id' => '12&',
-        ),
-    ),
-    'module/action?id=12&test=4&toto=9' => array(
+        ],
+    ],
+    'module/action?id=12&test=4&toto=9' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'id' => 12,
             'test' => 4,
             'toto' => 9,
-        ),
-    ),
-    'module/action?id=12&test=4&5&6&7&&toto=9' => array(
+        ],
+    ],
+    'module/action?id=12&test=4&5&6&7&&toto=9' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'id' => 12,
             'test' => '4&5&6&7&',
             'toto' => 9,
-        ),
-    ),
-    'module/action?test=value1&value2&toto=9' => array(
+        ],
+    ],
+    'module/action?test=value1&value2&toto=9' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'test' => 'value1&value2',
             'toto' => 9,
-        ),
-    ),
-    'module/action?test=value1&value2' => array(
+        ],
+    ],
+    'module/action?test=value1&value2' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'test' => 'value1&value2',
-        ),
-    ),
-    'module/action?test=value1=value2&toto=9' => array(
+        ],
+    ],
+    'module/action?test=value1=value2&toto=9' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'test' => 'value1=value2',
             'toto' => 9,
-        ),
-    ),
-    'module/action?test=value1=value2' => array(
+        ],
+    ],
+    'module/action?test=value1=value2' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'test' => 'value1=value2',
-        ),
-    ),
-    'module/action?test=4&5&6&7&&toto=9&id=' => array(
+        ],
+    ],
+    'module/action?test=4&5&6&7&&toto=9&id=' => [
         '',
-        array(
+        [
             'module' => 'module',
             'action' => 'action',
             'test' => '4&5&6&7&',
             'toto' => 9,
             'id' => '',
-        ),
-    ),
-    '@test?test=4' => array(
+        ],
+    ],
+    '@test?test=4' => [
         'test',
-        array(
+        [
             'test' => 4,
-        ),
-    ),
-    '@test' => array(
+        ],
+    ],
+    '@test' => [
         'test',
-        array(
-        ),
-    ),
-    '@test?id=12&foo=bar' => array(
+        [
+        ],
+    ],
+    '@test?id=12&foo=bar' => [
         'test',
-        array(
+        [
             'id' => 12,
             'foo' => 'bar',
-        ),
-    ),
-    '@test?id=foo%26bar&foo=bar%3Dfoo' => array(
+        ],
+    ],
+    '@test?id=foo%26bar&foo=bar%3Dfoo' => [
         'test',
-        array(
+        [
             'id' => 'foo&bar',
             'foo' => 'bar=foo',
-        ),
-    ),
-);
+        ],
+    ],
+];
 
 // ->convertUrlStringToParameters()
 $t->diag('->convertUrlStringToParameters()');
@@ -162,7 +163,7 @@ public function send()
 try {
     $controller->convertUrlStringToParameters('@test?foobar');
     $t->fail('->convertUrlStringToParameters() throw a sfParseException if it cannot parse the query string');
-} catch (sfParseException $e) {
+} catch (\sfParseException $e) {
     $t->pass('->convertUrlStringToParameters() throw a sfParseException if it cannot parse the query string');
 }
 
@@ -177,9 +178,9 @@ public function send()
 try {
     $controller->redirect(null);
     $t->fail('->redirect() throw an InvalidArgumentException when the url argument is null');
-} catch (InvalidArgumentException $iae) {
+} catch (\InvalidArgumentException $iae) {
     $t->pass('->redirect() throw an InvalidArgumentException when the url argument is null');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('->redirect() throw an InvalidArgumentException when the url argument is null. '.get_class($e).' was received');
 }
 
@@ -187,15 +188,15 @@ public function send()
 try {
     $controller->redirect('');
     $t->fail('->redirect() throw an InvalidArgumentException when the url argument is an empty string');
-} catch (InvalidArgumentException $iae) {
+} catch (\InvalidArgumentException $iae) {
     $t->pass('->redirect() throw an InvalidArgumentException when the url argument is an empty string');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('->redirect() throw an InvalidArgumentException when the url argument is an empty string. '.get_class($e).' was received');
 }
 
 // ->genUrl()
 $t->diag('->genUrl()');
-$t->is($controller->genUrl('module/action?id=4'), $controller->genUrl(array('action' => 'action', 'module' => 'module', 'id' => 4)), '->genUrl() accepts a string or an array as its first argument');
+$t->is($controller->genUrl('module/action?id=4'), $controller->genUrl(['action' => 'action', 'module' => 'module', 'id' => 4]), '->genUrl() accepts a string or an array as its first argument');
 
 $lastError = error_get_last();
 $controller->genUrl('');
diff --git a/test/unit/database/sfDatabaseTest.php b/test/unit/database/sfDatabaseTest.php
index 7a0ab91d0..59d86d81a 100644
--- a/test/unit/database/sfDatabaseTest.php
+++ b/test/unit/database/sfDatabaseTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +13,9 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(10);
+$t = new \lime_test(10);
 
-class myDatabase extends sfDatabase
+class myDatabase extends \sfDatabase
 {
     public function connect()
     {
@@ -25,12 +26,12 @@ public function shutdown()
     }
 }
 
-$context = sfContext::getInstance();
+$context = \sfContext::getInstance();
 
-$database = new myDatabase();
+$database = new \myDatabase();
 $database->initialize($context);
 
 // parameter holder proxy
 require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
-$pht = new sfParameterHolderProxyTest($t);
+$pht = new \sfParameterHolderProxyTest($t);
 $pht->launchTests($database, 'parameter');
diff --git a/test/unit/debug/sfDebugTest.php b/test/unit/debug/sfDebugTest.php
index 0b2d41594..ce1e4d864 100644
--- a/test/unit/debug/sfDebugTest.php
+++ b/test/unit/debug/sfDebugTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
 // ::removeObjects()
 $t->diag('::removeObjects()');
-$objectArray = array('foo', 42, new sfDebug(), array('bar', 23, new lime_test(null)));
-$cleanedArray = array('foo', 42, 'sfDebug Object()', array('bar', 23, 'lime_test Object()'));
-$t->is_deeply(sfDebug::removeObjects($objectArray), $cleanedArray, '::removeObjects() converts objects to String representations using the class name');
+$objectArray = ['foo', 42, new \sfDebug(), ['bar', 23, new \lime_test(null)]];
+$cleanedArray = ['foo', 42, 'sfDebug Object()', ['bar', 23, 'lime_test Object()']];
+$t->is_deeply(\sfDebug::removeObjects($objectArray), $cleanedArray, '::removeObjects() converts objects to String representations using the class name');
 
 $t->diag('::shortenFilePath()');
-$t->is(sfDebug::shortenFilePath(null), null, '->shortenFilePath() handles a null value');
+$t->is(\sfDebug::shortenFilePath(null), null, '->shortenFilePath() handles a null value');
diff --git a/test/unit/debug/sfTimerTest.php b/test/unit/debug/sfTimerTest.php
index ca547bf77..bf97b13f1 100644
--- a/test/unit/debug/sfTimerTest.php
+++ b/test/unit/debug/sfTimerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,10 +11,10 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
 $t->diag('sfTimer starting and stopping');
-$timer = new sfTimer();
+$timer = new \sfTimer();
 $timer->addTime();
 sleep(1);
 $timer->addTime();
@@ -21,11 +22,11 @@
 $t->ok($timer->getElapsedTime() > 0, '->getElapsedTime() returns a value greater than zero. No precision is tested by the unit test to avoid false alarms');
 
 $t->diag('sfTimerManager');
-$timerA = sfTimerManager::getTimer('timerA');
-$timerB = sfTimerManager::getTimer('timerB');
+$timerA = \sfTimerManager::getTimer('timerA');
+$timerB = \sfTimerManager::getTimer('timerB');
 $t->isa_ok($timerA, 'sfTimer', '::getTimer() returns an sfTimer instance');
-$timers = sfTimerManager::getTimers();
+$timers = \sfTimerManager::getTimers();
 $t->is(count($timers), 2, '::getTimers() returns an array with the timers created by the timer manager');
 $t->is($timers['timerA'], $timerA, '::getTimers() returns an array with keys being the timer name');
-sfTimerManager::clearTimers();
-$t->is(count(sfTimerManager::getTimers()), 0, '::clearTimers() empties the list of the timer instances');
+\sfTimerManager::clearTimers();
+$t->is(count(\sfTimerManager::getTimers()), 0, '::clearTimers() empties the list of the timer instances');
diff --git a/test/unit/debug/sfWebDebugTest.php b/test/unit/debug/sfWebDebugTest.php
index 28b3b238c..063803920 100644
--- a/test/unit/debug/sfWebDebugTest.php
+++ b/test/unit/debug/sfWebDebugTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,23 +11,23 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(10);
+$t = new \lime_test(10);
 
 /**
  * @internal
  *
  * @coversNothing
  */
-class sfWebDebugTest extends sfWebDebug
+class sfWebDebugTest extends \sfWebDebug
 {
     public function __construct()
     {
         $this->options['image_root_path'] = '';
-        $this->options['request_parameters'] = array();
+        $this->options['request_parameters'] = [];
     }
 }
 
-$debug = new sfWebDebugTest();
+$debug = new \sfWebDebugTest();
 
 // ->injectToolbar()
 $t->diag('->injectToolbar()');
diff --git a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
index 874534574..17529ff87 100644
--- a/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,16 +25,16 @@
 
 require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
-class sfException extends Exception
+class sfException extends \Exception
 {
 }
 
-sfConfig::set('sf_charset', 'UTF-8');
+\sfConfig::set('sf_charset', 'UTF-8');
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
-$a = array('<strong>escaped!</strong>', 1, null, array(2, '<strong>escaped!</strong>'));
-$escaped = sfOutputEscaper::escape('esc_entities', $a);
+$a = ['<strong>escaped!</strong>', 1, null, [2, '<strong>escaped!</strong>']];
+$escaped = \sfOutputEscaper::escape('esc_entities', $a);
 
 // ->getRaw()
 $t->diag('->getRaw()');
@@ -52,14 +53,14 @@ class sfException extends Exception
 try {
     unset($escaped[0]);
     $t->fail('The escaped object is read only (unset)');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('The escaped object is read only (unset)');
 }
 
 try {
     $escaped[0] = 12;
     $t->fail('The escaped object is read only (set)');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('The escaped object is read only (set)');
 }
 
@@ -93,5 +94,5 @@ class sfException extends Exception
 // ->valid()
 $t->diag('->valid()');
 
-$escaped = sfOutputEscaper::escape('esc_entities', array(1, 2, 3));
+$escaped = \sfOutputEscaper::escape('esc_entities', [1, 2, 3]);
 $t->is($escaped->valid(), true, '->valid() returns true if called before iteration');
diff --git a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
index c818d7a96..4db8d337b 100644
--- a/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
+++ b/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -24,13 +25,13 @@
 
 require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
-class sfException extends Exception
+class sfException extends \Exception
 {
 }
 
-sfConfig::set('sf_charset', 'UTF-8');
+\sfConfig::set('sf_charset', 'UTF-8');
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
 class OutputEscaperTest
 {
@@ -46,12 +47,12 @@ public function getTitle()
 
     public function getTitles()
     {
-        return array(1, 2, '<strong>escaped!</strong>');
+        return [1, 2, '<strong>escaped!</strong>'];
     }
 }
 
-$object = new OutputEscaperTest();
-$escaped = sfOutputEscaper::escape('esc_entities', $object);
+$object = new \OutputEscaperTest();
+$escaped = \sfOutputEscaper::escape('esc_entities', $object);
 
 $t->is($escaped->getTitle(), '&lt;strong&gt;escaped!&lt;/strong&gt;', 'The escaped object behaves like the real object');
 
@@ -64,8 +65,8 @@ public function getTitles()
 $t->is($escaped->__toString(), '&lt;strong&gt;escaped!&lt;/strong&gt;', 'The escaped object behaves like the real object');
 
 if (class_exists('SimpleXMLElement')) {
-    $element = new SimpleXMLElement('<foo>bar</foo>');
-    $escaped = sfOutputEscaper::escape('esc_entities', $element);
+    $element = new \SimpleXMLElement('<foo>bar</foo>');
+    $escaped = \sfOutputEscaper::escape('esc_entities', $element);
     $t->is((string) $escaped, (string) $element, '->__toString() is compatible with SimpleXMLElement');
 } else {
     $t->skip('->__toString() is compatible with SimpleXMLElement');
@@ -75,7 +76,7 @@ class Foo
 {
 }
 
-class FooCountable implements Countable
+class FooCountable implements \Countable
 {
     #[\ReturnTypeWillChange]
     public function count()
@@ -86,17 +87,17 @@ public function count()
 
 // implements Countable
 $t->diag('implements Countable');
-$foo = sfOutputEscaper::escape('esc_entities', new Foo());
-$fooc = sfOutputEscaper::escape('esc_entities', new FooCountable());
+$foo = \sfOutputEscaper::escape('esc_entities', new \Foo());
+$fooc = \sfOutputEscaper::escape('esc_entities', new \FooCountable());
 $t->is(count($foo), 1, '->count() returns 1 if the embedded object does not implement the Countable interface');
 $t->is(count($fooc), 2, '->count() returns the count() for the embedded object');
 
 // ->__isset()
 $t->diag('->__isset()');
 
-$raw = new stdClass();
+$raw = new \stdClass();
 $raw->foo = 'bar';
-$esc = sfOutputEscaper::escape('esc_entities', $raw);
+$esc = \sfOutputEscaper::escape('esc_entities', $raw);
 $t->ok(isset($esc->foo), '->__isset() asks the wrapped object whether a property is set');
 unset($raw->foo);
 $t->ok(!isset($esc->foo), '->__isset() asks the wrapped object whether a property is set');
diff --git a/test/unit/escaper/sfOutputEscaperSafeTest.php b/test/unit/escaper/sfOutputEscaperSafeTest.php
index f47cc9650..d260ff747 100644
--- a/test/unit/escaper/sfOutputEscaperSafeTest.php
+++ b/test/unit/escaper/sfOutputEscaperSafeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,11 +15,11 @@
 
 require_once __DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php';
 
-$t = new lime_test(13);
+$t = new \lime_test(13);
 
 // ->getValue()
 $t->diag('->getValue()');
-$safe = new sfOutputEscaperSafe('foo');
+$safe = new \sfOutputEscaperSafe('foo');
 $t->is($safe->getValue(), 'foo', '->getValue() returns the embedded value');
 
 // ->__set() ->__get()
@@ -29,7 +30,7 @@ class TestClass1
     public $foo = 'bar';
 }
 
-$safe = new sfOutputEscaperSafe(new TestClass1());
+$safe = new \sfOutputEscaperSafe(new \TestClass1());
 
 $t->is($safe->foo, 'bar', '->__get() returns the object parameter');
 $safe->foo = 'baz';
@@ -46,7 +47,7 @@ public function doSomething()
     }
 }
 
-$safe = new sfOutputEscaperSafe(new TestClass2());
+$safe = new \sfOutputEscaperSafe(new \TestClass2());
 $t->is($safe->doSomething(), 'ok', '->__call() invokes the embedded method');
 
 // ->__isset() ->__unset()
@@ -58,7 +59,7 @@ class TestClass3
     public $nullValue;
 }
 
-$safe = new sfOutputEscaperSafe(new TestClass3());
+$safe = new \sfOutputEscaperSafe(new \TestClass3());
 
 $t->is(isset($safe->boolValue), true, '->__isset() returns true if the property is not null');
 $t->is(isset($safe->nullValue), false, '->__isset() returns false if the property is null');
@@ -70,10 +71,10 @@ class TestClass3
 // Iterator
 $t->diag('Iterator');
 
-$input = array('one' => 1, 'two' => 2, 'three' => 3, 'children' => array(1, 2, 3));
-$output = array();
+$input = ['one' => 1, 'two' => 2, 'three' => 3, 'children' => [1, 2, 3]];
+$output = [];
 
-$safe = new sfOutputEscaperSafe($input);
+$safe = new \sfOutputEscaperSafe($input);
 foreach ($safe as $key => $value) {
     $output[$key] = $value;
 }
@@ -82,7 +83,7 @@ class TestClass3
 // ArrayAccess
 $t->diag('ArrayAccess');
 
-$safe = new sfOutputEscaperSafe(array('foo' => 'bar'));
+$safe = new \sfOutputEscaperSafe(['foo' => 'bar']);
 
 $t->is($safe['foo'], 'bar', '"ArrayAccess" implementation returns a value from the embedded array');
 $safe['foo'] = 'baz';
diff --git a/test/unit/escaper/sfOutputEscaperTest.php b/test/unit/escaper/sfOutputEscaperTest.php
index a01c07794..1a64fac46 100644
--- a/test/unit/escaper/sfOutputEscaperTest.php
+++ b/test/unit/escaper/sfOutputEscaperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -26,9 +27,9 @@
 
 require_once __DIR__.'/../../../lib/config/sfConfig.class.php';
 
-sfConfig::set('sf_charset', 'UTF-8');
+\sfConfig::set('sf_charset', 'UTF-8');
 
-$t = new lime_test(39);
+$t = new \lime_test(39);
 
 class OutputEscaperTestClass
 {
@@ -47,117 +48,117 @@ public function getTitleTitle()
     }
 }
 
-class OutputEscaperTestClassChild extends OutputEscaperTestClass
+class OutputEscaperTestClassChild extends \OutputEscaperTestClass
 {
 }
 
 // ::escape()
 $t->diag('::escape()');
 $t->diag('::escape() does not escape special values');
-$t->ok(null === sfOutputEscaper::escape('esc_entities', null), '::escape() returns null if the value to escape is null');
-$t->ok(false === sfOutputEscaper::escape('esc_entities', false), '::escape() returns false if the value to escape is false');
-$t->ok(true === sfOutputEscaper::escape('esc_entities', true), '::escape() returns true if the value to escape is true');
+$t->ok(null === \sfOutputEscaper::escape('esc_entities', null), '::escape() returns null if the value to escape is null');
+$t->ok(false === \sfOutputEscaper::escape('esc_entities', false), '::escape() returns false if the value to escape is false');
+$t->ok(true === \sfOutputEscaper::escape('esc_entities', true), '::escape() returns true if the value to escape is true');
 
 $t->diag('::escape() does not escape a value when escaping method is ESC_RAW');
-$t->is(sfOutputEscaper::escape('esc_raw', '<strong>escaped!</strong>'), '<strong>escaped!</strong>', '::escape() takes an escaping strategy function name as its first argument');
+$t->is(\sfOutputEscaper::escape('esc_raw', '<strong>escaped!</strong>'), '<strong>escaped!</strong>', '::escape() takes an escaping strategy function name as its first argument');
 
 $t->diag('::escape() escapes strings');
-$t->is(sfOutputEscaper::escape('esc_entities', '<strong>escaped!</strong>'), '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() returns an escaped string if the value to escape is a string');
-$t->is(sfOutputEscaper::escape('esc_entities', '<strong>échappé</strong>'), '&lt;strong&gt;&eacute;chapp&eacute;&lt;/strong&gt;', '::escape() returns an escaped string if the value to escape is a string');
+$t->is(\sfOutputEscaper::escape('esc_entities', '<strong>escaped!</strong>'), '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() returns an escaped string if the value to escape is a string');
+$t->is(\sfOutputEscaper::escape('esc_entities', '<strong>échappé</strong>'), '&lt;strong&gt;&eacute;chapp&eacute;&lt;/strong&gt;', '::escape() returns an escaped string if the value to escape is a string');
 
 $t->diag('::escape() escapes arrays');
-$input = array(
+$input = [
     'foo' => '<strong>escaped!</strong>',
-    'bar' => array('foo' => '<strong>escaped!</strong>'),
-);
-$output = sfOutputEscaper::escape('esc_entities', $input);
+    'bar' => ['foo' => '<strong>escaped!</strong>'],
+];
+$output = \sfOutputEscaper::escape('esc_entities', $input);
 $t->isa_ok($output, 'sfOutputEscaperArrayDecorator', '::escape() returns a sfOutputEscaperArrayDecorator object if the value to escape is an array');
 $t->is($output['foo'], '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() escapes all elements of the original array');
 $t->is($output['bar']['foo'], '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() is recursive');
 $t->is($output->getRawValue(), $input, '->getRawValue() returns the unescaped value');
 
 $t->diag('::escape() escapes objects');
-$input = new OutputEscaperTestClass();
-$output = sfOutputEscaper::escape('esc_entities', $input);
+$input = new \OutputEscaperTestClass();
+$output = \sfOutputEscaper::escape('esc_entities', $input);
 $t->isa_ok($output, 'sfOutputEscaperObjectDecorator', '::escape() returns a sfOutputEscaperObjectDecorator object if the value to escape is an object');
 $t->is($output->getTitle(), '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() escapes all methods of the original object');
 $t->is($output->title, '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() escapes all properties of the original object');
 $t->is($output->getTitleTitle(), '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() is recursive');
 $t->is($output->getRawValue(), $input, '->getRawValue() returns the unescaped value');
 
-$t->is(sfOutputEscaper::escape('esc_entities', $output)->getTitle(), '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() does not double escape an object');
-$t->isa_ok(sfOutputEscaper::escape('esc_entities', new DirectoryIterator('.')), 'sfOutputEscaperIteratorDecorator', '::escape() returns a sfOutputEscaperIteratorDecorator object if the value to escape is an object that implements the ArrayAccess interface');
+$t->is(\sfOutputEscaper::escape('esc_entities', $output)->getTitle(), '&lt;strong&gt;escaped!&lt;/strong&gt;', '::escape() does not double escape an object');
+$t->isa_ok(\sfOutputEscaper::escape('esc_entities', new \DirectoryIterator('.')), 'sfOutputEscaperIteratorDecorator', '::escape() returns a sfOutputEscaperIteratorDecorator object if the value to escape is an object that implements the ArrayAccess interface');
 
 $t->diag('::escape() does not escape object marked as being safe');
-$t->isa_ok(sfOutputEscaper::escape('esc_entities', new sfOutputEscaperSafe(new OutputEscaperTestClass())), 'OutputEscaperTestClass', '::escape() returns the original value if it is marked as being safe');
+$t->isa_ok(\sfOutputEscaper::escape('esc_entities', new \sfOutputEscaperSafe(new \OutputEscaperTestClass())), 'OutputEscaperTestClass', '::escape() returns the original value if it is marked as being safe');
 
-sfOutputEscaper::markClassAsSafe('OutputEscaperTestClass');
-$t->isa_ok(sfOutputEscaper::escape('esc_entities', new OutputEscaperTestClass()), 'OutputEscaperTestClass', '::escape() returns the original value if the object class is marked as being safe');
-$t->isa_ok(sfOutputEscaper::escape('esc_entities', new OutputEscaperTestClassChild()), 'OutputEscaperTestClassChild', '::escape() returns the original value if one of the object parent class is marked as being safe');
+\sfOutputEscaper::markClassAsSafe('OutputEscaperTestClass');
+$t->isa_ok(\sfOutputEscaper::escape('esc_entities', new \OutputEscaperTestClass()), 'OutputEscaperTestClass', '::escape() returns the original value if the object class is marked as being safe');
+$t->isa_ok(\sfOutputEscaper::escape('esc_entities', new \OutputEscaperTestClassChild()), 'OutputEscaperTestClassChild', '::escape() returns the original value if one of the object parent class is marked as being safe');
 
 $t->diag('::escape() cannot escape resources');
 $fh = fopen(__FILE__, 'r');
 
 try {
-    sfOutputEscaper::escape('esc_entities', $fh);
+    \sfOutputEscaper::escape('esc_entities', $fh);
     $t->fail('::escape() throws an InvalidArgumentException if the value cannot be escaped');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('::escape() throws an InvalidArgumentException if the value cannot be escaped');
 }
 
 // ::unescape()
 $t->diag('::unescape()');
 $t->diag('::unescape() does not unescape special values');
-$t->ok(null === sfOutputEscaper::unescape(null), '::unescape() returns null if the value to unescape is null');
-$t->ok(false === sfOutputEscaper::unescape(false), '::unescape() returns false if the value to unescape is false');
-$t->ok(true === sfOutputEscaper::unescape(true), '::unescape() returns true if the value to unescape is true');
+$t->ok(null === \sfOutputEscaper::unescape(null), '::unescape() returns null if the value to unescape is null');
+$t->ok(false === \sfOutputEscaper::unescape(false), '::unescape() returns false if the value to unescape is false');
+$t->ok(true === \sfOutputEscaper::unescape(true), '::unescape() returns true if the value to unescape is true');
 
 $t->diag('::unescape() unescapes strings');
-$t->is(sfOutputEscaper::unescape('&lt;strong&gt;escaped!&lt;/strong&gt;'), '<strong>escaped!</strong>', '::unescape() returns an unescaped string if the value to unescape is a string');
-$t->is(sfOutputEscaper::unescape('&lt;strong&gt;&eacute;chapp&eacute;&lt;/strong&gt;'), '<strong>échappé</strong>', '::unescape() returns an unescaped string if the value to unescape is a string');
+$t->is(\sfOutputEscaper::unescape('&lt;strong&gt;escaped!&lt;/strong&gt;'), '<strong>escaped!</strong>', '::unescape() returns an unescaped string if the value to unescape is a string');
+$t->is(\sfOutputEscaper::unescape('&lt;strong&gt;&eacute;chapp&eacute;&lt;/strong&gt;'), '<strong>échappé</strong>', '::unescape() returns an unescaped string if the value to unescape is a string');
 
 $t->diag('::unescape() unescapes arrays');
-$input = sfOutputEscaper::escape('esc_entities', array(
+$input = \sfOutputEscaper::escape('esc_entities', [
     'foo' => '<strong>escaped!</strong>',
-    'bar' => array('foo' => '<strong>escaped!</strong>'),
-));
-$output = sfOutputEscaper::unescape($input);
+    'bar' => ['foo' => '<strong>escaped!</strong>'],
+]);
+$output = \sfOutputEscaper::unescape($input);
 $t->ok(is_array($output), '::unescape() returns an array if the input is a sfOutputEscaperArrayDecorator object');
 $t->is($output['foo'], '<strong>escaped!</strong>', '::unescape() unescapes all elements of the original array');
 $t->is($output['bar']['foo'], '<strong>escaped!</strong>', '::unescape() is recursive');
 
 $t->diag('::unescape() unescapes objects');
-$object = new OutputEscaperTestClass();
-$input = sfOutputEscaper::escape('esc_entities', $object);
-$output = sfOutputEscaper::unescape($input);
+$object = new \OutputEscaperTestClass();
+$input = \sfOutputEscaper::escape('esc_entities', $object);
+$output = \sfOutputEscaper::unescape($input);
 $t->isa_ok($output, 'OutputEscaperTestClass', '::unescape() returns the original object when a sfOutputEscaperObjectDecorator object is passed');
 $t->is($output->getTitle(), '<strong>escaped!</strong>', '::unescape() unescapes all methods of the original object');
 $t->is($output->title, '<strong>escaped!</strong>', '::unescape() unescapes all properties of the original object');
 $t->is($output->getTitleTitle(), '<strong>escaped!</strong>', '::unescape() is recursive');
 
-$t->isa_ok(sfOutputEscaperIteratorDecorator::unescape(sfOutputEscaper::escape('esc_entities', new DirectoryIterator('.'))), 'DirectoryIterator', '::unescape() unescapes sfOutputEscaperIteratorDecorator objects');
+$t->isa_ok(\sfOutputEscaperIteratorDecorator::unescape(\sfOutputEscaper::escape('esc_entities', new \DirectoryIterator('.'))), 'DirectoryIterator', '::unescape() unescapes sfOutputEscaperIteratorDecorator objects');
 
 $t->diag('::unescape() does not unescape object marked as being safe');
-$t->isa_ok(sfOutputEscaper::unescape(sfOutputEscaper::escape('esc_entities', new sfOutputEscaperSafe(new OutputEscaperTestClass()))), 'OutputEscaperTestClass', '::unescape() returns the original value if it is marked as being safe');
+$t->isa_ok(\sfOutputEscaper::unescape(\sfOutputEscaper::escape('esc_entities', new \sfOutputEscaperSafe(new \OutputEscaperTestClass()))), 'OutputEscaperTestClass', '::unescape() returns the original value if it is marked as being safe');
 
-sfOutputEscaper::markClassAsSafe('OutputEscaperTestClass');
-$t->isa_ok(sfOutputEscaper::unescape(sfOutputEscaper::escape('esc_entities', new OutputEscaperTestClass())), 'OutputEscaperTestClass', '::unescape() returns the original value if the object class is marked as being safe');
-$t->isa_ok(sfOutputEscaper::unescape(sfOutputEscaper::escape('esc_entities', new OutputEscaperTestClassChild())), 'OutputEscaperTestClassChild', '::unescape() returns the original value if one of the object parent class is marked as being safe');
+\sfOutputEscaper::markClassAsSafe('OutputEscaperTestClass');
+$t->isa_ok(\sfOutputEscaper::unescape(\sfOutputEscaper::escape('esc_entities', new \OutputEscaperTestClass())), 'OutputEscaperTestClass', '::unescape() returns the original value if the object class is marked as being safe');
+$t->isa_ok(\sfOutputEscaper::unescape(\sfOutputEscaper::escape('esc_entities', new \OutputEscaperTestClassChild())), 'OutputEscaperTestClassChild', '::unescape() returns the original value if one of the object parent class is marked as being safe');
 
 $t->diag('::unescape() do nothing to resources');
 $fh = fopen(__FILE__, 'r');
-$t->is(sfOutputEscaper::unescape($fh), $fh, '::unescape() do nothing to resources');
+$t->is(\sfOutputEscaper::unescape($fh), $fh, '::unescape() do nothing to resources');
 
 $t->diag('::unescape() unescapes mixed arrays');
-$object = new OutputEscaperTestClass();
-$input = array(
+$object = new \OutputEscaperTestClass();
+$input = [
     'foo' => 'bar',
-    'bar' => sfOutputEscaper::escape('esc_entities', '<strong>bar</strong>'),
-    'foobar' => sfOutputEscaper::escape('esc_entities', $object),
-);
-$output = array(
+    'bar' => \sfOutputEscaper::escape('esc_entities', '<strong>bar</strong>'),
+    'foobar' => \sfOutputEscaper::escape('esc_entities', $object),
+];
+$output = [
     'foo' => 'bar',
     'bar' => '<strong>bar</strong>',
     'foobar' => $object,
-);
-$t->is(sfOutputEscaper::unescape($input), $output, '::unescape() unescapes values with some escaped and unescaped values');
+];
+$t->is(\sfOutputEscaper::unescape($input), $output, '::unescape() unescapes values with some escaped and unescaped values');
diff --git a/test/unit/event/sfEventDispatcherTest.php b/test/unit/event/sfEventDispatcherTest.php
index 51a49c681..27caea2ad 100644
--- a/test/unit/event/sfEventDispatcherTest.php
+++ b/test/unit/event/sfEventDispatcherTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,21 +11,21 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(19);
+$t = new \lime_test(19);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // ->connect() ->disconnect()
 $t->diag('->connect() ->disconnect()');
 $dispatcher->connect('bar', 'listenToBar');
-$t->is($dispatcher->getListeners('bar'), array('listenToBar'), '->connect() connects a listener to an event name');
+$t->is($dispatcher->getListeners('bar'), ['listenToBar'], '->connect() connects a listener to an event name');
 $dispatcher->connect('bar', 'listenToBarBar');
-$t->is($dispatcher->getListeners('bar'), array('listenToBar', 'listenToBarBar'), '->connect() can connect several listeners for the same event name');
+$t->is($dispatcher->getListeners('bar'), ['listenToBar', 'listenToBarBar'], '->connect() can connect several listeners for the same event name');
 
 $dispatcher->connect('barbar', 'listenToBarBar');
 $dispatcher->disconnect('bar', 'listenToBarBar');
-$t->is($dispatcher->getListeners('bar'), array('listenToBar'), '->disconnect() disconnects a listener for an event name');
-$t->is($dispatcher->getListeners('barbar'), array('listenToBarBar'), '->disconnect() disconnects a listener for an event name');
+$t->is($dispatcher->getListeners('bar'), ['listenToBar'], '->disconnect() disconnects a listener for an event name');
+$t->is($dispatcher->getListeners('barbar'), ['listenToBarBar'], '->disconnect() disconnects a listener for an event name');
 
 $t->ok(false === $dispatcher->disconnect('foobar', 'listen'), '->disconnect() returns false if the listener does not exist');
 
@@ -36,82 +37,82 @@
 $dispatcher->disconnect('foo', 'listenToFoo');
 $t->is($dispatcher->hasListeners('foo'), false, '->hasListeners() returns false if the event has no listener');
 
-$t->is($dispatcher->getListeners('bar'), array('listenToBar'), '->getListeners() returns an array of listeners connected to the given event name');
-$t->is($dispatcher->getListeners('foobar'), array(), '->getListeners() returns an empty array if no listener are connected to the given event name');
+$t->is($dispatcher->getListeners('bar'), ['listenToBar'], '->getListeners() returns an array of listeners connected to the given event name');
+$t->is($dispatcher->getListeners('foobar'), [], '->getListeners() returns an empty array if no listener are connected to the given event name');
 
-$listener = new Listener();
+$listener = new \Listener();
 
 // ->notify()
 $t->diag('->notify()');
 $listener->reset();
-$dispatcher = new sfEventDispatcher();
-$dispatcher->connect('foo', array($listener, 'listenToFoo'));
-$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
-$e = $dispatcher->notify($event = new sfEvent(new stdClass(), 'foo'));
+$dispatcher = new \sfEventDispatcher();
+$dispatcher->connect('foo', [$listener, 'listenToFoo']);
+$dispatcher->connect('foo', [$listener, 'listenToFooBis']);
+$e = $dispatcher->notify($event = new \sfEvent(new \stdClass(), 'foo'));
 $t->is($listener->getValue(), 'listenToFoolistenToFooBis', '->notify() notifies all registered listeners in order');
 $t->is($e, $event, '->notify() returns the event object');
 
 $listener->reset();
-$dispatcher = new sfEventDispatcher();
-$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
-$dispatcher->connect('foo', array($listener, 'listenToFoo'));
-$dispatcher->notify(new sfEvent(new stdClass(), 'foo'));
+$dispatcher = new \sfEventDispatcher();
+$dispatcher->connect('foo', [$listener, 'listenToFooBis']);
+$dispatcher->connect('foo', [$listener, 'listenToFoo']);
+$dispatcher->notify(new \sfEvent(new \stdClass(), 'foo'));
 $t->is($listener->getValue(), 'listenToFooBislistenToFoo', '->notify() notifies all registered listeners in order');
 
 // ->notifyUntil()
 $t->diag('->notifyUntil()');
 $listener->reset();
-$dispatcher = new sfEventDispatcher();
-$dispatcher->connect('foo', array($listener, 'listenToFoo'));
-$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
-$e = $dispatcher->notifyUntil($event = new sfEvent(new stdClass(), 'foo'));
+$dispatcher = new \sfEventDispatcher();
+$dispatcher->connect('foo', [$listener, 'listenToFoo']);
+$dispatcher->connect('foo', [$listener, 'listenToFooBis']);
+$e = $dispatcher->notifyUntil($event = new \sfEvent(new \stdClass(), 'foo'));
 $t->is($listener->getValue(), 'listenToFoolistenToFooBis', '->notifyUntil() notifies all registered listeners in order and stops if it returns true');
 $t->is($e, $event, '->notifyUntil() returns the event object');
 
 $listener->reset();
-$dispatcher = new sfEventDispatcher();
-$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
-$dispatcher->connect('foo', array($listener, 'listenToFoo'));
-$e = $dispatcher->notifyUntil($event = new sfEvent(new stdClass(), 'foo'));
+$dispatcher = new \sfEventDispatcher();
+$dispatcher->connect('foo', [$listener, 'listenToFooBis']);
+$dispatcher->connect('foo', [$listener, 'listenToFoo']);
+$e = $dispatcher->notifyUntil($event = new \sfEvent(new \stdClass(), 'foo'));
 $t->is($listener->getValue(), 'listenToFooBis', '->notifyUntil() notifies all registered listeners in order and stops if it returns true');
 
 // ->filter()
 $t->diag('->filter()');
 $listener->reset();
-$dispatcher = new sfEventDispatcher();
-$dispatcher->connect('foo', array($listener, 'filterFoo'));
-$dispatcher->connect('foo', array($listener, 'filterFooBis'));
-$e = $dispatcher->filter($event = new sfEvent(new stdClass(), 'foo'), 'foo');
+$dispatcher = new \sfEventDispatcher();
+$dispatcher->connect('foo', [$listener, 'filterFoo']);
+$dispatcher->connect('foo', [$listener, 'filterFooBis']);
+$e = $dispatcher->filter($event = new \sfEvent(new \stdClass(), 'foo'), 'foo');
 $t->is($e->getReturnValue(), '-*foo*-', '->filter() filters a value');
 $t->is($e, $event, '->filter() returns the event object');
 
 $listener->reset();
-$dispatcher = new sfEventDispatcher();
-$dispatcher->connect('foo', array($listener, 'filterFooBis'));
-$dispatcher->connect('foo', array($listener, 'filterFoo'));
-$e = $dispatcher->filter($event = new sfEvent(new stdClass(), 'foo'), 'foo');
+$dispatcher = new \sfEventDispatcher();
+$dispatcher->connect('foo', [$listener, 'filterFooBis']);
+$dispatcher->connect('foo', [$listener, 'filterFoo']);
+$e = $dispatcher->filter($event = new \sfEvent(new \stdClass(), 'foo'), 'foo');
 $t->is($e->getReturnValue(), '*-foo-*', '->filter() filters a value');
 
 class Listener
 {
     protected $value = '';
 
-    public function filterFoo(sfEvent $event, $foo)
+    public function filterFoo(\sfEvent $event, $foo)
     {
         return "*{$foo}*";
     }
 
-    public function filterFooBis(sfEvent $event, $foo)
+    public function filterFooBis(\sfEvent $event, $foo)
     {
         return "-{$foo}-";
     }
 
-    public function listenToFoo(sfEvent $event)
+    public function listenToFoo(\sfEvent $event)
     {
         $this->value .= 'listenToFoo';
     }
 
-    public function listenToFooBis(sfEvent $event)
+    public function listenToFooBis(\sfEvent $event)
     {
         $this->value .= 'listenToFooBis';
 
diff --git a/test/unit/event/sfEventTest.php b/test/unit/event/sfEventTest.php
index 9abb5af6b..0d0a95f77 100644
--- a/test/unit/event/sfEventTest.php
+++ b/test/unit/event/sfEventTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
-$subject = new stdClass();
-$parameters = array('foo' => 'bar');
-$event = new sfEvent($subject, 'name', $parameters);
+$subject = new \stdClass();
+$parameters = ['foo' => 'bar'];
+$event = new \sfEvent($subject, 'name', $parameters);
 
 // ->getSubject()
 $t->diag('->getSubject()');
@@ -49,7 +50,7 @@
 try {
     $event['foobar'];
     $t->fail('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
 }
 
diff --git a/test/unit/exception/sfExceptionsTest.php b/test/unit/exception/sfExceptionsTest.php
index fba024289..30ae2c495 100644
--- a/test/unit/exception/sfExceptionsTest.php
+++ b/test/unit/exception/sfExceptionsTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,19 +11,19 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(24);
+$t = new \lime_test(24);
 
-foreach (array(
+foreach ([
     'cache', 'configuration', 'controller', 'database',
     'error404', 'factory', 'file', 'filter', 'forward', 'initialization', 'parse', 'render', 'security',
     'stop', 'storage', 'view',
-) as $class) {
+] as $class) {
     $class = sprintf('sf%sException', ucfirst($class));
     $e = new $class();
-    $t->ok($e instanceof sfException, sprintf('"%s" inherits from sfException', $class));
+    $t->ok($e instanceof \sfException, sprintf('"%s" inherits from sfException', $class));
 }
 
-class myException extends sfException
+class myException extends \sfException
 {
     public static function formatArgsTest($args, $single = false, $format = 'html')
     {
@@ -32,12 +33,12 @@ public static function formatArgsTest($args, $single = false, $format = 'html')
 
 // sfException::formatArgs()
 $t->diag('sfException::formatArgs()');
-$t->is(myException::formatArgsTest('foo', true), "'foo'", 'formatArgs() can format a single argument');
-$t->is(myException::formatArgsTest(array('foo', 'bar')), "'foo', 'bar'", 'formatArgs() can format an array of arguments');
-$t->is(myException::formatArgsTest(new stdClass(), true), "<em>object</em>('stdClass')", 'formatArgs() can format an objet instance');
-$t->is(myException::formatArgsTest(null, true), '<em>null</em>', 'formatArgs() can format a null');
-$t->is(myException::formatArgsTest(100, true), '100', 'formatArgs() can format an integer');
-$t->is(myException::formatArgsTest(array('foo' => new stdClass(), 'bar' => 2), true), "<em>array</em>('foo' => <em>object</em>('stdClass'), 'bar' => 2)", 'formatArgs() can format a nested array');
+$t->is(\myException::formatArgsTest('foo', true), "'foo'", 'formatArgs() can format a single argument');
+$t->is(\myException::formatArgsTest(['foo', 'bar']), "'foo', 'bar'", 'formatArgs() can format an array of arguments');
+$t->is(\myException::formatArgsTest(new \stdClass(), true), "<em>object</em>('stdClass')", 'formatArgs() can format an objet instance');
+$t->is(\myException::formatArgsTest(null, true), '<em>null</em>', 'formatArgs() can format a null');
+$t->is(\myException::formatArgsTest(100, true), '100', 'formatArgs() can format an integer');
+$t->is(\myException::formatArgsTest(['foo' => new \stdClass(), 'bar' => 2], true), "<em>array</em>('foo' => <em>object</em>('stdClass'), 'bar' => 2)", 'formatArgs() can format a nested array');
 
-$t->is(myException::formatArgsTest('&', true), "'&amp;'", 'formatArgs() escapes strings');
-$t->is(myException::formatArgsTest(array('&' => '&'), true), "<em>array</em>('&amp;' => '&amp;')", 'formatArgs() escapes strings for keys and values in arrays');
+$t->is(\myException::formatArgsTest('&', true), "'&amp;'", 'formatArgs() escapes strings');
+$t->is(\myException::formatArgsTest(['&' => '&'], true), "<em>array</em>('&amp;' => '&amp;')", 'formatArgs() escapes strings for keys and values in arrays');
diff --git a/test/unit/filter/sfFilterTest.php b/test/unit/filter/sfFilterTest.php
index 8518d3426..cba4495c1 100644
--- a/test/unit/filter/sfFilterTest.php
+++ b/test/unit/filter/sfFilterTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +13,9 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(17);
+$t = new \lime_test(17);
 
-class myFilter extends sfFilter
+class myFilter extends \sfFilter
 {
     public function isFirstCall()
     {
@@ -22,14 +23,14 @@ public function isFirstCall()
     }
 }
 
-$context = sfContext::getInstance();
-$filter = new myFilter($context);
+$context = \sfContext::getInstance();
+$filter = new \myFilter($context);
 
 // ->initialize()
 $t->diag('->initialize()');
-$filter = new myFilter($context);
+$filter = new \myFilter($context);
 $t->is($filter->getContext(), $context, '->initialize() takes a sfContext object as its first argument');
-$filter->initialize($context, array('foo' => 'bar'));
+$filter->initialize($context, ['foo' => 'bar']);
 $t->is($filter->getParameter('foo'), 'bar', '->initialize() takes an array of parameters as its second argument');
 
 // ->getContext()
@@ -43,11 +44,11 @@ public function isFirstCall()
 $t->is($filter->isFirstCall('beforeExecution'), false, '->isFirstCall() returns false if this is not the first call with this argument');
 $t->is($filter->isFirstCall('beforeExecution'), false, '->isFirstCall() returns false if this is not the first call with this argument');
 
-$filter = new myFilter($context);
+$filter = new \myFilter($context);
 $filter->initialize($context);
 $t->is($filter->isFirstCall('beforeExecution'), false, '->isFirstCall() returns false if this is not the first call with this argument');
 
 // parameter holder proxy
 require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
-$pht = new sfParameterHolderProxyTest($t);
+$pht = new \sfParameterHolderProxyTest($t);
 $pht->launchTests($filter, 'parameter');
diff --git a/test/unit/form/addon/sfFormSymfonyTest.php b/test/unit/form/addon/sfFormSymfonyTest.php
index ab1f2f1f5..9db78821f 100644
--- a/test/unit/form/addon/sfFormSymfonyTest.php
+++ b/test/unit/form/addon/sfFormSymfonyTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,18 +11,18 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
 class FormListener
 {
-    public $events = array();
+    public $events = [];
 
-    public function listen(sfEvent $event)
+    public function listen(\sfEvent $event)
     {
         $this->events[] = func_get_args();
     }
 
-    public function filter(sfEvent $event, $value)
+    public function filter(\sfEvent $event, $value)
     {
         $this->events[] = func_get_args();
 
@@ -30,27 +31,27 @@ public function filter(sfEvent $event, $value)
 
     public function reset()
     {
-        $this->events = array();
+        $this->events = [];
     }
 }
 
-$listener = new FormListener();
-$dispatcher = new sfEventDispatcher();
+$listener = new \FormListener();
+$dispatcher = new \sfEventDispatcher();
 
-$dispatcher->connect('form.post_configure', array($listener, 'listen'));
-$dispatcher->connect('form.filter_values', array($listener, 'filter'));
-$dispatcher->connect('form.validation_error', array($listener, 'listen'));
+$dispatcher->connect('form.post_configure', [$listener, 'listen']);
+$dispatcher->connect('form.filter_values', [$listener, 'filter']);
+$dispatcher->connect('form.validation_error', [$listener, 'listen']);
 
-sfFormSymfony::setEventDispatcher($dispatcher);
+\sfFormSymfony::setEventDispatcher($dispatcher);
 
-class TestForm extends sfFormSymfony
+class TestForm extends \sfFormSymfony
 {
     public function configure()
     {
-        $this->setValidators(array(
-            'first_name' => new sfValidatorString(),
-            'last_name' => new sfValidatorString(),
-        ));
+        $this->setValidators([
+            'first_name' => new \sfValidatorString(),
+            'last_name' => new \sfValidatorString(),
+        ]);
     }
 }
 
@@ -58,25 +59,25 @@ public function configure()
 $t->diag('->__construct()');
 
 $listener->reset();
-$form = new TestForm();
+$form = new \TestForm();
 $t->is(count($listener->events), 1, '->__construct() notifies one event');
 $t->is($listener->events[0][0]->getName(), 'form.post_configure', '->__construct() notifies the "form.post_configure" event');
 
 // ->bind()
 $t->diag('->bind()');
 
-$form = new TestForm();
+$form = new \TestForm();
 $listener->reset();
-$form->bind(array(
+$form->bind([
     'first_name' => 'John',
     'last_name' => 'Doe',
-));
+]);
 
 $t->is(count($listener->events), 1, '->bind() notifies one event when validation is successful');
 $t->is($listener->events[0][0]->getName(), 'form.filter_values', '->bind() notifies the "form.filter_values" event');
-$t->is_deeply($listener->events[0][1], array('first_name' => 'John', 'last_name' => 'Doe'), '->bind() filters the tainted values');
+$t->is_deeply($listener->events[0][1], ['first_name' => 'John', 'last_name' => 'Doe'], '->bind() filters the tainted values');
 
-$form = new TestForm();
+$form = new \TestForm();
 $listener->reset();
 $form->bind();
 
diff --git a/test/unit/form/sfFormFieldSchemaTest.php b/test/unit/form/sfFormFieldSchemaTest.php
index 4d1715ca6..5e8f4d1f4 100644
--- a/test/unit/form/sfFormFieldSchemaTest.php
+++ b/test/unit/form/sfFormFieldSchemaTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,29 +11,29 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
 // widgets
-$authorSchema = new sfWidgetFormSchema(array(
-    'name' => $nameWidget = new sfWidgetFormInputText(),
-));
+$authorSchema = new \sfWidgetFormSchema([
+    'name' => $nameWidget = new \sfWidgetFormInputText(),
+]);
 $authorSchema->setNameFormat('article[author][%s]');
 
-$schema = new sfWidgetFormSchema(array(
-    'title' => $titleWidget = new sfWidgetFormInputText(),
+$schema = new \sfWidgetFormSchema([
+    'title' => $titleWidget = new \sfWidgetFormInputText(),
     'author' => $authorSchema,
-));
+]);
 $schema->setNameFormat('article[%s]');
 
 // errors
-$authorErrorSchema = new sfValidatorErrorSchema(new sfValidatorString());
-$authorErrorSchema->addError(new sfValidatorError(new sfValidatorString(), 'name error'), 'name');
+$authorErrorSchema = new \sfValidatorErrorSchema(new \sfValidatorString());
+$authorErrorSchema->addError(new \sfValidatorError(new \sfValidatorString(), 'name error'), 'name');
 
-$articleErrorSchema = new sfValidatorErrorSchema(new sfValidatorString());
-$articleErrorSchema->addError($titleError = new sfValidatorError(new sfValidatorString(), 'title error'), 'title');
+$articleErrorSchema = new \sfValidatorErrorSchema(new \sfValidatorString());
+$articleErrorSchema->addError($titleError = new \sfValidatorError(new \sfValidatorString(), 'title error'), 'title');
 $articleErrorSchema->addError($authorErrorSchema, 'author');
 
-$parent = new sfFormFieldSchema($schema, null, 'article', array('title' => 'symfony', 'author' => array('name' => 'Fabien')), $articleErrorSchema);
+$parent = new \sfFormFieldSchema($schema, null, 'article', ['title' => 'symfony', 'author' => ['name' => 'Fabien']], $articleErrorSchema);
 $f = $parent['title'];
 $child = $parent['author'];
 
@@ -45,38 +46,38 @@
 try {
     unset($parent['title']);
     $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
 }
 
 try {
     $parent['title'] = null;
     $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
 }
 
 try {
     $parent['title1'];
     $t->fail('sfFormField implements the ArrayAccess interface but in read-only mode');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('sfFormField implements the ArrayAccess interface but in read-only mode');
 }
 
 // implements Countable
 $t->diag('implements Countable');
-$widgetSchema = new sfWidgetFormSchema(array(
-    'w1' => $w1 = new sfWidgetFormInputText(),
-    'w2' => $w2 = new sfWidgetFormInputText(),
-));
-$f = new sfFormFieldSchema($widgetSchema, null, 'article', array());
+$widgetSchema = new \sfWidgetFormSchema([
+    'w1' => $w1 = new \sfWidgetFormInputText(),
+    'w2' => $w2 = new \sfWidgetFormInputText(),
+]);
+$f = new \sfFormFieldSchema($widgetSchema, null, 'article', []);
 $t->is(count($f), 2, 'sfFormFieldSchema implements the Countable interface');
 
 // implements Iterator
 $t->diag('implements Iterator');
-$f = new sfFormFieldSchema($widgetSchema, null, 'article', array());
+$f = new \sfFormFieldSchema($widgetSchema, null, 'article', []);
 
-$values = array();
+$values = [];
 foreach ($f as $name => $value) {
     $values[$name] = $value;
 }
@@ -86,10 +87,10 @@
 
 $t->diag('implements Iterator respecting the order of fields');
 $widgetSchema->moveField('w2', 'first');
-$f = new sfFormFieldSchema($widgetSchema, null, 'article', array());
+$f = new \sfFormFieldSchema($widgetSchema, null, 'article', []);
 
-$values = array();
+$values = [];
 foreach ($f as $name => $value) {
     $values[$name] = $value;
 }
-$t->is(array_keys($values), array('w2', 'w1'), 'sfFormFieldSchema keeps the order');
+$t->is(array_keys($values), ['w2', 'w1'], 'sfFormFieldSchema keeps the order');
diff --git a/test/unit/form/sfFormFieldTest.php b/test/unit/form/sfFormFieldTest.php
index 902bd6852..4cac37861 100644
--- a/test/unit/form/sfFormFieldTest.php
+++ b/test/unit/form/sfFormFieldTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,31 +11,31 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(31);
+$t = new \lime_test(31);
 
 // widgets
-$authorSchema = new sfWidgetFormSchema(array(
-    'id' => new sfWidgetFormInputHidden(),
-    'name' => $nameWidget = new sfWidgetFormInputText(),
-));
+$authorSchema = new \sfWidgetFormSchema([
+    'id' => new \sfWidgetFormInputHidden(),
+    'name' => $nameWidget = new \sfWidgetFormInputText(),
+]);
 $authorSchema->setNameFormat('article[author][%s]');
 
-$schema = new sfWidgetFormSchema(array(
-    'title' => $titleWidget = new sfWidgetFormInputText(),
+$schema = new \sfWidgetFormSchema([
+    'title' => $titleWidget = new \sfWidgetFormInputText(),
     'author' => $authorSchema,
-));
+]);
 $schema->setNameFormat('article[%s]');
 $titleWidget->setParent($schema);
 
 // errors
-$authorErrorSchema = new sfValidatorErrorSchema(new sfValidatorString());
-$authorErrorSchema->addError(new sfValidatorError(new sfValidatorString(), 'name error'), 'name');
+$authorErrorSchema = new \sfValidatorErrorSchema(new \sfValidatorString());
+$authorErrorSchema->addError(new \sfValidatorError(new \sfValidatorString(), 'name error'), 'name');
 
-$articleErrorSchema = new sfValidatorErrorSchema(new sfValidatorString());
-$articleErrorSchema->addError($titleError = new sfValidatorError(new sfValidatorString(), 'title error'), 'title');
+$articleErrorSchema = new \sfValidatorErrorSchema(new \sfValidatorString());
+$articleErrorSchema->addError($titleError = new \sfValidatorError(new \sfValidatorString(), 'title error'), 'title');
 $articleErrorSchema->addError($authorErrorSchema, 'author');
 
-$parent = new sfFormFieldSchema($schema, null, 'article', array('title' => 'symfony', 'author' => array('name' => 'Fabien')), $articleErrorSchema);
+$parent = new \sfFormFieldSchema($schema, null, 'article', ['title' => 'symfony', 'author' => ['name' => 'Fabien']], $articleErrorSchema);
 $f = $parent['title'];
 $child = $parent['author'];
 
@@ -47,9 +48,9 @@
 $t->is($f->getError(), $titleError, '->getError() returns the form field error');
 $t->is($f->hasError(), true, '->hasError() returns true if the form field has some error');
 
-$errorSchema1 = new sfValidatorErrorSchema(new sfValidatorString());
-$errorSchema1->addError(new sfValidatorError(new sfValidatorString(), 'error'), 'title1');
-$parent1 = new sfFormFieldSchema($schema, null, 'article', array('title' => 'symfony'), $errorSchema1);
+$errorSchema1 = new \sfValidatorErrorSchema(new \sfValidatorString());
+$errorSchema1->addError(new \sfValidatorError(new \sfValidatorString(), 'error'), 'title1');
+$parent1 = new \sfFormFieldSchema($schema, null, 'article', ['title' => 'symfony'], $errorSchema1);
 $f1 = $parent1['title'];
 $t->is($f1->hasError(), false, '->hasError() returns false if the form field has no error');
 
@@ -59,7 +60,7 @@
 
 // ->render()
 $t->diag('->render()');
-$t->is($f->render(array('class' => 'foo')), '<input type="text" name="article[title]" value="symfony" class="foo" id="article_title" />', '->render() renders the form field');
+$t->is($f->render(['class' => 'foo']), '<input type="text" name="article[title]" value="symfony" class="foo" id="article_title" />', '->render() renders the form field');
 
 // ->renderRow()
 $t->diag('->renderRow()');
@@ -85,7 +86,7 @@
 </tr>
 
 EOF;
-$t->is($f->renderRow(array('class' => 'foo', 'type' => 'password', 'id' => 'title')), fix_linebreaks($output), '->renderRow() can take an array of HTML attributes as its first argument');
+$t->is($f->renderRow(['class' => 'foo', 'type' => 'password', 'id' => 'title']), fix_linebreaks($output), '->renderRow() can take an array of HTML attributes as its first argument');
 
 $output = <<<'EOF'
 <tr>
@@ -97,7 +98,7 @@
 </tr>
 
 EOF;
-$t->is($f->renderRow(array(), 'My title'), fix_linebreaks($output), '->renderRow() can take a label name as its second argument');
+$t->is($f->renderRow([], 'My title'), fix_linebreaks($output), '->renderRow() can take a label name as its second argument');
 
 $output = <<<'EOF'
 <tr>
@@ -109,7 +110,7 @@
 </tr>
 
 EOF;
-$t->is($f->renderRow(array(), null, 'help'), fix_linebreaks($output), '->renderRow() can take a help message as its third argument');
+$t->is($f->renderRow([], null, 'help'), fix_linebreaks($output), '->renderRow() can take a help message as its third argument');
 
 $output = <<<'EOF'
 <tr>
@@ -130,19 +131,19 @@
 try {
     $parent->renderRow();
     $t->fail('->renderRow() throws an LogicException if the form field has no parent');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->renderRow() throws an LogicException if the form field has no parent');
 }
 
 // ->renderLabel()
 $t->diag('->renderLabel()');
 $t->is($f->renderLabel(), '<label for="article_title">Title</label>', '->renderLabel() renders the label as HTML');
-$t->is($f->renderLabel(null, array('class' => 'foo')), '<label class="foo" for="article_title">Title</label>', '->renderLabel() renders optional HTML attributes');
+$t->is($f->renderLabel(null, ['class' => 'foo']), '<label class="foo" for="article_title">Title</label>', '->renderLabel() renders optional HTML attributes');
 
 try {
     $parent->renderLabel();
     $t->fail('->renderLabel() throws an LogicException if the form field has no parent');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->renderLabel() throws an LogicException if the form field has no parent');
 }
 
@@ -153,7 +154,7 @@
 try {
     $parent->renderLabelName();
     $t->fail('->renderLabelName() throws an LogicException if the form field has no parent');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->renderLabelName() throws an LogicException if the form field has no parent');
 }
 
@@ -192,21 +193,21 @@
 try {
     $parent->renderError();
     $t->fail('->renderError() throws an LogicException if the form field has no parent');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->renderError() throws an LogicException if the form field has no parent');
 }
 
 // global errors
-$authorErrorSchema = new sfValidatorErrorSchema(new sfValidatorString());
-$authorErrorSchema->addError(new sfValidatorError(new sfValidatorString(), 'name error'), 'name');
-$authorErrorSchema->addError(new sfValidatorError(new sfValidatorString(), 'non existent field error'), 'non_existent_field');
-$authorErrorSchema->addError(new sfValidatorError(new sfValidatorString(), 'hidden field error'), 'id');
+$authorErrorSchema = new \sfValidatorErrorSchema(new \sfValidatorString());
+$authorErrorSchema->addError(new \sfValidatorError(new \sfValidatorString(), 'name error'), 'name');
+$authorErrorSchema->addError(new \sfValidatorError(new \sfValidatorString(), 'non existent field error'), 'non_existent_field');
+$authorErrorSchema->addError(new \sfValidatorError(new \sfValidatorString(), 'hidden field error'), 'id');
 
-$articleErrorSchema = new sfValidatorErrorSchema(new sfValidatorString());
-$articleErrorSchema->addError($titleError = new sfValidatorError(new sfValidatorString(), 'title error'), 'title');
+$articleErrorSchema = new \sfValidatorErrorSchema(new \sfValidatorString());
+$articleErrorSchema->addError($titleError = new \sfValidatorError(new \sfValidatorString(), 'title error'), 'title');
 $articleErrorSchema->addError($authorErrorSchema, 'author');
 
-$parent = new sfFormFieldSchema($schema, null, 'article', array('title' => 'symfony', 'author' => array('name' => 'Fabien')), $articleErrorSchema);
+$parent = new \sfFormFieldSchema($schema, null, 'article', ['title' => 'symfony', 'author' => ['name' => 'Fabien']], $articleErrorSchema);
 $child = $parent['author'];
 $output = <<<'EOF'
   <ul class="error_list">
@@ -219,5 +220,5 @@
 
 // id format
 $schema->setIdFormat('%s_id_format_test');
-$parent = new sfFormFieldSchema($schema, null, 'article', array('title' => 'symfony', 'author' => array('name' => 'Fabien')), $articleErrorSchema);
+$parent = new \sfFormFieldSchema($schema, null, 'article', ['title' => 'symfony', 'author' => ['name' => 'Fabien']], $articleErrorSchema);
 $t->like($parent['author']->render(), '/_id_format_test/', '->render() uses the parent id format');
diff --git a/test/unit/form/sfFormTest.php b/test/unit/form/sfFormTest.php
index 2944a0d4d..022dc1426 100644
--- a/test/unit/form/sfFormTest.php
+++ b/test/unit/form/sfFormTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,14 +11,14 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(157);
+$t = new \lime_test(157);
 
 /**
  * @internal
  *
  * @coversNothing
  */
-class FormTest extends sfForm
+class FormTest extends \sfForm
 {
     public function getCSRFToken($secret = null)
     {
@@ -30,31 +31,31 @@ public function getCSRFToken($secret = null)
  *
  * @coversNothing
  */
-class TestForm1 extends FormTest
+class TestForm1 extends \FormTest
 {
     public function configure()
     {
         $this->disableCSRFProtection();
-        $this->setWidgets(array(
-            'a' => new sfWidgetFormInputText(),
-            'b' => new sfWidgetFormInputText(),
-            'c' => new sfWidgetFormInputText(),
-        ));
-        $this->setValidators(array(
-            'a' => new sfValidatorString(array('min_length' => 2)),
-            'b' => new sfValidatorString(array('max_length' => 3)),
-            'c' => new sfValidatorString(array('max_length' => 1000)),
-        ));
-        $this->getWidgetSchema()->setLabels(array(
+        $this->setWidgets([
+            'a' => new \sfWidgetFormInputText(),
+            'b' => new \sfWidgetFormInputText(),
+            'c' => new \sfWidgetFormInputText(),
+        ]);
+        $this->setValidators([
+            'a' => new \sfValidatorString(['min_length' => 2]),
+            'b' => new \sfValidatorString(['max_length' => 3]),
+            'c' => new \sfValidatorString(['max_length' => 1000]),
+        ]);
+        $this->getWidgetSchema()->setLabels([
             'a' => '1_a',
             'b' => '1_b',
             'c' => '1_c',
-        ));
-        $this->getWidgetSchema()->setHelps(array(
+        ]);
+        $this->getWidgetSchema()->setHelps([
             'a' => '1_a',
             'b' => '1_b',
             'c' => '1_c',
-        ));
+        ]);
     }
 }
 
@@ -63,29 +64,29 @@ public function configure()
  *
  * @coversNothing
  */
-class TestForm2 extends FormTest
+class TestForm2 extends \FormTest
 {
     public function configure()
     {
         $this->disableCSRFProtection();
-        $this->setWidgets(array(
-            'c' => new sfWidgetFormTextarea(),
-            'd' => new sfWidgetFormTextarea(),
-        ));
-        $this->setValidators(array(
-            'c' => new sfValidatorPass(),
-            'd' => new sfValidatorString(array('max_length' => 5)),
-        ));
-        $this->getWidgetSchema()->setLabels(array(
+        $this->setWidgets([
+            'c' => new \sfWidgetFormTextarea(),
+            'd' => new \sfWidgetFormTextarea(),
+        ]);
+        $this->setValidators([
+            'c' => new \sfValidatorPass(),
+            'd' => new \sfValidatorString(['max_length' => 5]),
+        ]);
+        $this->getWidgetSchema()->setLabels([
             'c' => '2_c',
             'd' => '2_d',
-        ));
-        $this->getWidgetSchema()->setHelps(array(
+        ]);
+        $this->getWidgetSchema()->setHelps([
             'c' => '2_c',
             'd' => '2_d',
-        ));
-        $this->validatorSchema->setPreValidator(new sfValidatorPass());
-        $this->validatorSchema->setPostValidator(new sfValidatorPass());
+        ]);
+        $this->validatorSchema->setPreValidator(new \sfValidatorPass());
+        $this->validatorSchema->setPostValidator(new \sfValidatorPass());
     }
 }
 
@@ -94,7 +95,7 @@ public function configure()
  *
  * @coversNothing
  */
-class TestForm3 extends FormTest
+class TestForm3 extends \FormTest
 {
     public function configure()
     {
@@ -107,7 +108,7 @@ public function configure()
  *
  * @coversNothing
  */
-class TestForm4 extends FormTest
+class TestForm4 extends \FormTest
 {
     public function configure()
     {
@@ -115,82 +116,82 @@ public function configure()
     }
 }
 
-class NumericFieldsForm extends sfForm
+class NumericFieldsForm extends \sfForm
 {
     public function configure()
     {
-        $this->setWidgets(array(
-            '5' => new sfWidgetFormInputText(),
-        ));
+        $this->setWidgets([
+            '5' => new \sfWidgetFormInputText(),
+        ]);
 
-        $this->setValidators(array(
-            '5' => new sfValidatorString(),
-        ));
+        $this->setValidators([
+            '5' => new \sfValidatorString(),
+        ]);
 
-        $this->widgetSchema->setLabels(array('5' => 'label'.$this->getOption('salt')));
-        $this->widgetSchema->setHelps(array('5' => 'help'.$this->getOption('salt')));
+        $this->widgetSchema->setLabels(['5' => 'label'.$this->getOption('salt')]);
+        $this->widgetSchema->setHelps(['5' => 'help'.$this->getOption('salt')]);
     }
 }
 
-sfForm::disableCSRFProtection();
+\sfForm::disableCSRFProtection();
 
 // __construct()
 $t->diag('__construct');
-$f = new FormTest();
-$t->ok($f->getValidatorSchema() instanceof sfValidatorSchema, '__construct() creates an empty validator schema');
-$t->ok($f->getWidgetSchema() instanceof sfWidgetFormSchema, '__construct() creates an empty widget form schema');
+$f = new \FormTest();
+$t->ok($f->getValidatorSchema() instanceof \sfValidatorSchema, '__construct() creates an empty validator schema');
+$t->ok($f->getWidgetSchema() instanceof \sfWidgetFormSchema, '__construct() creates an empty widget form schema');
 
-$f = new sfForm(array('first_name' => 'Fabien'));
-$t->is($f->getDefaults(), array('first_name' => 'Fabien'), '__construct() can take an array of default values as its first argument');
+$f = new \sfForm(['first_name' => 'Fabien']);
+$t->is($f->getDefaults(), ['first_name' => 'Fabien'], '__construct() can take an array of default values as its first argument');
 
-$f = new FormTest(array(), array(), 'secret');
+$f = new \FormTest([], [], 'secret');
 $v = $f->getValidatorSchema();
 $t->ok($f->isCSRFProtected(), '__construct() takes a CSRF secret as its second argument');
-$t->is($v[sfForm::getCSRFFieldName()]->getOption('token'), '*secret*', '__construct() takes a CSRF secret as its second argument');
+$t->is($v[\sfForm::getCSRFFieldName()]->getOption('token'), '*secret*', '__construct() takes a CSRF secret as its second argument');
 
-sfForm::enableCSRFProtection();
-$f = new FormTest(array(), array(), false);
+\sfForm::enableCSRFProtection();
+$f = new \FormTest([], [], false);
 $t->ok(!$f->isCSRFProtected(), '__construct() can disable the CSRF protection by passing false as the second argument');
 
-$f = new FormTest();
+$f = new \FormTest();
 $t->ok($f->isCSRFProtected(), '__construct() uses CSRF protection if null is passed as the second argument and it\'s enabled globally');
 
 // ->getOption() ->setOption() ->getOptions()
 $t->diag('->getOption() ->setOption()');
-$f = new FormTest(array(), array('foo' => 'bar'));
+$f = new \FormTest([], ['foo' => 'bar']);
 $t->is($f->getOption('foo'), 'bar', '__construct takes an option array as its second argument');
 $f->setOption('bar', 'foo');
 $t->is($f->getOption('bar'), 'foo', '->setOption() changes the value of an option');
-$t->is_deeply($f->getOptions(), array('foo' => 'bar', 'bar' => 'foo'), '->getOptions() returns all options');
+$t->is_deeply($f->getOptions(), ['foo' => 'bar', 'bar' => 'foo'], '->getOptions() returns all options');
 
-sfForm::disableCSRFProtection();
+\sfForm::disableCSRFProtection();
 
 // ->setDefault() ->getDefault() ->hasDefault() ->setDefaults() ->getDefaults()
 $t->diag('->setDefault() ->getDefault() ->hasDefault() ->setDefaults() ->getDefaults()');
-$f = new FormTest();
-$f->setDefaults(array('first_name' => 'Fabien'));
-$t->is($f->getDefaults(), array('first_name' => 'Fabien'), 'setDefaults() sets the form default values');
+$f = new \FormTest();
+$f->setDefaults(['first_name' => 'Fabien']);
+$t->is($f->getDefaults(), ['first_name' => 'Fabien'], 'setDefaults() sets the form default values');
 $f->setDefault('last_name', 'Potencier');
-$t->is($f->getDefaults(), array('first_name' => 'Fabien', 'last_name' => 'Potencier'), 'setDefault() sets a default value');
+$t->is($f->getDefaults(), ['first_name' => 'Fabien', 'last_name' => 'Potencier'], 'setDefault() sets a default value');
 $t->is($f->hasDefault('first_name'), true, 'hasDefault() returns true if the form has a default value for the given field');
 $t->is($f->hasDefault('name'), false, 'hasDefault() returns false if the form does not have a default value for the given field');
 $t->is($f->getDefault('first_name'), 'Fabien', 'getDefault() returns a default value for a given field');
 $t->is($f->getDefault('name'), null, 'getDefault() returns null if the form does not have a default value for a given field');
 
-sfForm::enableCSRFProtection('*mygreatsecret*');
-$f = new FormTest();
-$f->setDefaults(array('first_name' => 'Fabien'));
+\sfForm::enableCSRFProtection('*mygreatsecret*');
+$f = new \FormTest();
+$f->setDefaults(['first_name' => 'Fabien']);
 $t->is($f->getDefault('_csrf_token'), $f->getCSRFToken('*mygreatsecret*'), '->getDefaults() keeps the CSRF token default value');
 
-$f = new FormTest(array(), array(), false);
-$f->setDefaults(array('first_name' => 'Fabien'));
+$f = new \FormTest([], [], false);
+$f->setDefaults(['first_name' => 'Fabien']);
 $t->is(array_key_exists('_csrf_token', $f->getDefaults()), false, '->setDefaults() does not set the CSRF token if CSRF is disabled');
-sfForm::disableCSRFProtection();
+\sfForm::disableCSRFProtection();
 
 // ->getName()
 $t->diag('->getName()');
-$f = new FormTest();
-$w = new sfWidgetFormSchema();
+$f = new \FormTest();
+$w = new \sfWidgetFormSchema();
 $f->setWidgetSchema($w);
 $t->ok(false === $f->getName(), '->getName() returns false if the name format is not an array');
 $w->setNameFormat('foo_%s');
@@ -200,80 +201,80 @@ public function configure()
 
 // ::enableCSRFProtection() ::disableCSRFProtection() ->isCSRFProtected()
 $t->diag('::enableCSRFProtection() ::disableCSRFProtection()');
-sfForm::enableCSRFProtection();
-$f1 = new FormTest();
+\sfForm::enableCSRFProtection();
+$f1 = new \FormTest();
 $t->ok($f1->isCSRFProtected(), '::enableCSRFProtection() enabled CSRF protection for all future forms');
-sfForm::disableCSRFProtection();
-$f2 = new FormTest();
+\sfForm::disableCSRFProtection();
+$f2 = new \FormTest();
 $t->ok(!$f2->isCSRFProtected(), '::disableCSRFProtection() disables CSRF protection for all future forms');
 $t->ok($f1->isCSRFProtected(), '::enableCSRFProtection() enabled CSRF protection for all future forms');
-sfForm::enableCSRFProtection();
+\sfForm::enableCSRFProtection();
 $t->ok(!$f2->isCSRFProtected(), '::disableCSRFProtection() disables CSRF protection for all future forms');
 
-$f = new FormTest(array(), array(), false);
+$f = new \FormTest([], [], false);
 $t->ok(!$f->isCSRFProtected(), '->isCSRFProtected() returns true if the form is CSRF protected');
 
-sfForm::enableCSRFProtection('mygreatsecret');
-$f = new FormTest();
+\sfForm::enableCSRFProtection('mygreatsecret');
+$f = new \FormTest();
 $v = $f->getValidatorSchema();
-$t->is($v[sfForm::getCSRFFieldName()]->getOption('token'), '*mygreatsecret*', '::enableCSRFProtection() can take a secret argument');
+$t->is($v[\sfForm::getCSRFFieldName()]->getOption('token'), '*mygreatsecret*', '::enableCSRFProtection() can take a secret argument');
 
 // ->enableLocalCSRFProtection() ->disableLocalCSRFProtection()
 $t->diag('->enableLocalCSRFProtection() ->disableLocalCSRFProtection()');
-$f = new TestForm3();
-sfForm::disableCSRFProtection();
+$f = new \TestForm3();
+\sfForm::disableCSRFProtection();
 $t->ok(!$f->isCSRFProtected(), '->disableLocalCSRFProtection() disabled CSRF protection for the current form');
-sfForm::enableCSRFProtection();
+\sfForm::enableCSRFProtection();
 $t->ok(!$f->isCSRFProtected(), '->disableLocalCSRFProtection() disabled CSRF protection for the current form, even if the global CSRF protection is enabled');
-$f = new TestForm3(array(), array(), 'foo');
+$f = new \TestForm3([], [], 'foo');
 $t->ok(!$f->isCSRFProtected(), '->disableLocalCSRFProtection() disabled CSRF protection for the current form, even a CSRF secret is provided in the constructor');
-sfForm::disableCSRFProtection();
-$f = new TestForm4();
+\sfForm::disableCSRFProtection();
+$f = new \TestForm4();
 $t->ok($f->isCSRFProtected(), '->enableLocalCSRFProtection() enables CSRF protection when passed null and global CSRF is disabled');
-$f = new TestForm4(array(), array('csrf_secret' => '**localsecret**'));
+$f = new \TestForm4([], ['csrf_secret' => '**localsecret**']);
 $t->ok($f->isCSRFProtected(), '->enableLocalCSRFProtection() enables CSRF protection when passed a string global CSRF is disabled');
 
 // ::getCSRFFieldName() ::setCSRFFieldName()
 $t->diag('::getCSRFFieldName() ::setCSRFFieldName()');
-sfForm::enableCSRFProtection();
-sfForm::setCSRFFieldName('_token_');
-$f = new FormTest();
+\sfForm::enableCSRFProtection();
+\sfForm::setCSRFFieldName('_token_');
+$f = new \FormTest();
 $v = $f->getValidatorSchema();
 $t->ok(isset($v['_token_']), '::setCSRFFieldName() changes the CSRF token field name');
-$t->is(sfForm::getCSRFFieldName(), '_token_', '::getCSRFFieldName() returns the CSRF token field name');
+$t->is(\sfForm::getCSRFFieldName(), '_token_', '::getCSRFFieldName() returns the CSRF token field name');
 
 // ->isMultipart()
 $t->diag('->isMultipart()');
-$f = new FormTest();
+$f = new \FormTest();
 $t->ok(!$f->isMultipart(), '->isMultipart() returns false if the form does not need a multipart form');
-$f->setWidgetSchema(new sfWidgetFormSchema(array('image' => new sfWidgetFormInputFile())));
+$f->setWidgetSchema(new \sfWidgetFormSchema(['image' => new \sfWidgetFormInputFile()]));
 $t->ok($f->isMultipart(), '->isMultipart() returns true if the form needs a multipart form');
 
 // ->setValidators() ->setValidatorSchema() ->getValidatorSchema() ->setValidator() ->getValidator()
 $t->diag('->setValidators() ->setValidatorSchema() ->getValidatorSchema() ->setValidator() ->getValidator()');
-$f = new FormTest();
-$validators = array(
-    'first_name' => new sfValidatorPass(),
-    'last_name' => new sfValidatorPass(),
-);
-$validatorSchema = new sfValidatorSchema($validators);
+$f = new \FormTest();
+$validators = [
+    'first_name' => new \sfValidatorPass(),
+    'last_name' => new \sfValidatorPass(),
+];
+$validatorSchema = new \sfValidatorSchema($validators);
 $f->setValidatorSchema($validatorSchema);
 $t->is_deeply($f->getValidatorSchema(), $validatorSchema, '->setValidatorSchema() sets the current validator schema');
 $f->setValidators($validators);
 $schema = $f->getValidatorSchema();
 $t->ok($schema['first_name'] == $validators['first_name'], '->setValidators() sets field validators');
 $t->ok($schema['last_name'] == $validators['last_name'], '->setValidators() sets field validators');
-$f->setValidator('name', $v3 = new sfValidatorPass());
+$f->setValidator('name', $v3 = new \sfValidatorPass());
 $t->ok($f->getValidator('name') == $v3, '->setValidator() sets a validator for a field');
 
 // ->setWidgets() ->setWidgetSchema() ->getWidgetSchema() ->getWidget() ->setWidget()
 $t->diag('->setWidgets() ->setWidgetSchema() ->getWidgetSchema()');
-$f = new FormTest();
-$widgets = array(
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-);
-$widgetSchema = new sfWidgetFormSchema($widgets);
+$f = new \FormTest();
+$widgets = [
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+];
+$widgetSchema = new \sfWidgetFormSchema($widgets);
 $f->setWidgetSchema($widgetSchema);
 $t->ok($f->getWidgetSchema() == $widgetSchema, '->setWidgetSchema() sets the current widget schema');
 $f->setWidgets($widgets);
@@ -282,34 +283,34 @@ public function configure()
 $widgets['last_name']->setParent($schema);
 $t->ok($schema['first_name'] == $widgets['first_name'], '->setWidgets() sets field widgets');
 $t->ok($schema['last_name'] == $widgets['last_name'], '->setWidgets() sets field widgets');
-$f->setWidget('name', $w3 = new sfWidgetFormInputText());
+$f->setWidget('name', $w3 = new \sfWidgetFormInputText());
 $w3->setParent($schema);
 $t->ok($f->getWidget('name') == $w3, '->setWidget() sets a widget for a field');
 
 // ArrayAccess interface
 $t->diag('ArrayAccess interface');
-$f = new FormTest();
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'first_name' => new sfWidgetFormInputText(array('default' => 'Fabien')),
-    'last_name' => new sfWidgetFormInputText(),
-    'image' => new sfWidgetFormInputFile(),
-)));
-$f->setValidatorSchema(new sfValidatorSchema(array(
-    'first_name' => new sfValidatorPass(),
-    'last_name' => new sfValidatorPass(),
-    'image' => new sfValidatorPass(),
-)));
-$f->setDefaults(array(
+$f = new \FormTest();
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'first_name' => new \sfWidgetFormInputText(['default' => 'Fabien']),
+    'last_name' => new \sfWidgetFormInputText(),
+    'image' => new \sfWidgetFormInputFile(),
+]));
+$f->setValidatorSchema(new \sfValidatorSchema([
+    'first_name' => new \sfValidatorPass(),
+    'last_name' => new \sfValidatorPass(),
+    'image' => new \sfValidatorPass(),
+]));
+$f->setDefaults([
     'image' => 'default.gif',
-));
-$f->embedForm('embedded', new sfForm());
-$t->ok($f['first_name'] instanceof sfFormField, '"sfForm" implements the ArrayAccess interface');
+]);
+$f->embedForm('embedded', new \sfForm());
+$t->ok($f['first_name'] instanceof \sfFormField, '"sfForm" implements the ArrayAccess interface');
 $t->is($f['first_name']->render(), '<input type="text" name="first_name" value="Fabien" id="first_name" />', '"sfForm" implements the ArrayAccess interface');
 
 try {
     $f['image'] = 'image';
     $t->fail('"sfForm" ArrayAccess implementation does not permit to set a form field');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('"sfForm" ArrayAccess implementation does not permit to set a form field');
 }
 $t->ok(isset($f['image']), '"sfForm" implements the ArrayAccess interface');
@@ -324,172 +325,172 @@ public function configure()
 try {
     $f['nonexistant'];
     $t->fail('"sfForm" ArrayAccess implementation throws a LogicException if the form field does not exist');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('"sfForm" ArrayAccess implementation throws a LogicException if the form field does not exist');
 }
 
 unset($f['embedded']);
 $t->ok(!array_key_exists('embedded', $f->getEmbeddedForms()), '"sfForm" ArrayAccess implementation removes embedded forms');
 
-$f->bind(array(
+$f->bind([
     'first_name' => 'John',
     'last_name' => 'Doe',
-));
+]);
 unset($f['first_name']);
-$t->is_deeply($f->getValues(), array('last_name' => 'Doe'), '"sfForm" ArrayAccess implementation removes bound values');
-$w['first_name'] = new sfWidgetFormInputText();
+$t->is_deeply($f->getValues(), ['last_name' => 'Doe'], '"sfForm" ArrayAccess implementation removes bound values');
+$w['first_name'] = new \sfWidgetFormInputText();
 $t->is($f['first_name']->getValue(), '', '"sfForm" ArrayAccess implementation removes tainted values');
 
 // Countable interface
 $t->diag('Countable interface');
-$f = new FormTest();
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'first_name' => new sfWidgetFormInputText(array('default' => 'Fabien')),
-    'last_name' => new sfWidgetFormInputText(),
-    'image' => new sfWidgetFormInputFile(),
-)));
+$f = new \FormTest();
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'first_name' => new \sfWidgetFormInputText(['default' => 'Fabien']),
+    'last_name' => new \sfWidgetFormInputText(),
+    'image' => new \sfWidgetFormInputFile(),
+]));
 $t->is(count($f), 3, '"sfForm" implements the Countable interface');
 
 // Iterator interface
 $t->diag('Iterator interface');
-$f = new FormTest();
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'first_name' => new sfWidgetFormInputText(array('default' => 'Fabien')),
-    'last_name' => new sfWidgetFormInputText(),
-    'image' => new sfWidgetFormInputFile(),
-)));
+$f = new \FormTest();
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'first_name' => new \sfWidgetFormInputText(['default' => 'Fabien']),
+    'last_name' => new \sfWidgetFormInputText(),
+    'image' => new \sfWidgetFormInputFile(),
+]));
 foreach ($f as $name => $value) {
     $values[$name] = $value;
 }
 $t->is(isset($values['first_name']), true, '"sfForm" implements the Iterator interface');
 $t->is(isset($values['last_name']), true, '"sfForm" implements the Iterator interface');
-$t->is_deeply(array_keys($values), array('first_name', 'last_name', 'image'), '"sfForm" implements the Iterator interface');
+$t->is_deeply(array_keys($values), ['first_name', 'last_name', 'image'], '"sfForm" implements the Iterator interface');
 
 // ->useFields()
 $t->diag('->useFields()');
-$f = new FormTest();
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-    'email' => new sfWidgetFormInputText(),
-)));
-$f->useFields(array('first_name', 'last_name'));
-$t->is($f->getWidgetSchema()->getPositions(), array('first_name', 'last_name'), '->useFields() removes all fields except the ones given as an argument');
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-    'email' => new sfWidgetFormInputText(),
-)));
-$f->useFields(array('email', 'first_name'));
-$t->is($f->getWidgetSchema()->getPositions(), array('email', 'first_name'), '->useFields() reorders the fields');
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-    'email' => new sfWidgetFormInputText(),
-)));
-$f->useFields(array('email', 'first_name'), false);
-$t->is($f->getWidgetSchema()->getPositions(), array('first_name', 'email'), '->useFields() does not reorder the fields if the second argument is false');
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'id' => new sfWidgetFormInputHidden(),
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-    'email' => new sfWidgetFormInputText(),
-)));
-$f->useFields(array('first_name', 'last_name'));
-$t->is($f->getWidgetSchema()->getPositions(), array('first_name', 'last_name', 'id'), '->useFields() does not remove hidden fields');
+$f = new \FormTest();
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+    'email' => new \sfWidgetFormInputText(),
+]));
+$f->useFields(['first_name', 'last_name']);
+$t->is($f->getWidgetSchema()->getPositions(), ['first_name', 'last_name'], '->useFields() removes all fields except the ones given as an argument');
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+    'email' => new \sfWidgetFormInputText(),
+]));
+$f->useFields(['email', 'first_name']);
+$t->is($f->getWidgetSchema()->getPositions(), ['email', 'first_name'], '->useFields() reorders the fields');
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+    'email' => new \sfWidgetFormInputText(),
+]));
+$f->useFields(['email', 'first_name'], false);
+$t->is($f->getWidgetSchema()->getPositions(), ['first_name', 'email'], '->useFields() does not reorder the fields if the second argument is false');
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'id' => new \sfWidgetFormInputHidden(),
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+    'email' => new \sfWidgetFormInputText(),
+]));
+$f->useFields(['first_name', 'last_name']);
+$t->is($f->getWidgetSchema()->getPositions(), ['first_name', 'last_name', 'id'], '->useFields() does not remove hidden fields');
 
 // ->bind() ->isValid() ->hasErrors() ->getValues() ->getValue() ->isBound() ->getErrorSchema()
 $t->diag('->bind() ->isValid() ->getValues() ->isBound() ->getErrorSchema()');
-$f = new FormTest();
-$f->setValidatorSchema(new sfValidatorSchema(array(
-    'first_name' => new sfValidatorString(array('min_length' => 2)),
-    'last_name' => new sfValidatorString(array('min_length' => 2)),
-)));
+$f = new \FormTest();
+$f->setValidatorSchema(new \sfValidatorSchema([
+    'first_name' => new \sfValidatorString(['min_length' => 2]),
+    'last_name' => new \sfValidatorString(['min_length' => 2]),
+]));
 $t->ok(!$f->isBound(), '->isBound() returns false if the form is not bound');
-$t->is($f->getValues(), array(), '->getValues() returns an empty array if the form is not bound');
+$t->is($f->getValues(), [], '->getValues() returns an empty array if the form is not bound');
 $t->ok(!$f->isValid(), '->isValid() returns false if the form is not bound');
 $t->ok(!$f->hasErrors(), '->hasErrors() returns false if the form is not bound');
 
 $t->is($f->getValue('first_name'), null, '->getValue() returns null if the form is not bound');
-$f->bind(array('first_name' => 'Fabien', 'last_name' => 'Potencier'));
+$f->bind(['first_name' => 'Fabien', 'last_name' => 'Potencier']);
 $t->ok($f->isBound(), '->isBound() returns true if the form is bound');
-$t->is($f->getValues(), array('first_name' => 'Fabien', 'last_name' => 'Potencier'), '->getValues() returns an array of cleaned values if the form is bound');
+$t->is($f->getValues(), ['first_name' => 'Fabien', 'last_name' => 'Potencier'], '->getValues() returns an array of cleaned values if the form is bound');
 $t->ok($f->isValid(), '->isValid() returns true if the form passes the validation');
 $t->ok(!$f->hasErrors(), '->hasErrors() returns false if the form passes the validation');
 $t->is($f->getValue('first_name'), 'Fabien', '->getValue() returns the cleaned value for a field name if the form is bound');
 $t->is($f->getValue('nonsense'), null, '->getValue() returns null when non-existant param is requested');
 
-$f->bind(array());
+$f->bind([]);
 $t->ok(!$f->isValid(), '->isValid() returns false if the form does not pass the validation');
 $t->ok($f->hasErrors(), '->isValid() returns true if the form does not pass the validation');
-$t->is($f->getValues(), array(), '->getValues() returns an empty array if the form does not pass the validation');
+$t->is($f->getValues(), [], '->getValues() returns an empty array if the form does not pass the validation');
 $t->is($f->getErrorSchema()->getMessage(), 'first_name [Required.] last_name [Required.]', '->getErrorSchema() returns an error schema object with all errors');
 
 $t->diag('bind when field names are numeric');
-$f = new FormTest();
-$f->setValidatorSchema(new sfValidatorSchema(array(
-    1 => new sfValidatorString(array('min_length' => 2)),
-    2 => new sfValidatorString(array('min_length' => 2)),
-)));
-$f->bind(array(1 => 'fabien', 2 => 'potencier'));
+$f = new \FormTest();
+$f->setValidatorSchema(new \sfValidatorSchema([
+    1 => new \sfValidatorString(['min_length' => 2]),
+    2 => new \sfValidatorString(['min_length' => 2]),
+]));
+$f->bind([1 => 'fabien', 2 => 'potencier']);
 $t->ok($f->isValid(), '->bind() behaves correctly when field names are numeric');
 
 $t->diag('bind with files');
-$f = new FormTest();
-$f->setValidatorSchema(new sfValidatorSchema(array(
-    1 => new sfValidatorString(array('min_length' => 2)),
-    2 => new sfValidatorString(array('min_length' => 2)),
-    'file' => new sfValidatorFile(array('max_size' => 2)),
-)));
-$f->setWidgetSchema(new sfWidgetFormSchema(array('file' => new sfWidgetFormInputFile())));
-$f->bind(array(1 => 'f', 2 => 'potencier'), array(
-    'file' => array('name' => 'test1.txt', 'type' => 'text/plain', 'tmp_name' => '/tmp/test1.txt', 'error' => 0, 'size' => 100),
-));
+$f = new \FormTest();
+$f->setValidatorSchema(new \sfValidatorSchema([
+    1 => new \sfValidatorString(['min_length' => 2]),
+    2 => new \sfValidatorString(['min_length' => 2]),
+    'file' => new \sfValidatorFile(['max_size' => 2]),
+]));
+$f->setWidgetSchema(new \sfWidgetFormSchema(['file' => new \sfWidgetFormInputFile()]));
+$f->bind([1 => 'f', 2 => 'potencier'], [
+    'file' => ['name' => 'test1.txt', 'type' => 'text/plain', 'tmp_name' => '/tmp/test1.txt', 'error' => 0, 'size' => 100],
+]);
 $t->is($f->getErrorSchema()->getCode(), '1 [min_length] file [max_size]', '->bind() behaves correctly with files');
 
 try {
-    $f->bind(array(1 => 'f', 2 => 'potencier'));
+    $f->bind([1 => 'f', 2 => 'potencier']);
     $t->fail('->bind() second argument is mandatory if the form is multipart');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->bind() second argument is mandatory if the form is multipart');
 }
 
 $t->diag('bind with files in embed form');
-$pf = new FormTest(); // parent form
-$pf->setValidatorSchema(new sfValidatorSchema()); // cleaning sfValidatorSchema to silence `_token_`
+$pf = new \FormTest(); // parent form
+$pf->setValidatorSchema(new \sfValidatorSchema()); // cleaning sfValidatorSchema to silence `_token_`
 
-$ef = new FormTest(); // embed form
+$ef = new \FormTest(); // embed form
 
-$ef->setValidatorSchema(new sfValidatorSchema(array(
-    1 => new sfValidatorString(array('min_length' => 2)),
-    2 => new sfValidatorString(array('min_length' => 2)),
-    'file' => new sfValidatorFile(array('max_size' => 2)),
-)));
-$ef->setWidgetSchema(new sfWidgetFormSchema(array('file' => new sfWidgetFormInputFile())));
+$ef->setValidatorSchema(new \sfValidatorSchema([
+    1 => new \sfValidatorString(['min_length' => 2]),
+    2 => new \sfValidatorString(['min_length' => 2]),
+    'file' => new \sfValidatorFile(['max_size' => 2]),
+]));
+$ef->setWidgetSchema(new \sfWidgetFormSchema(['file' => new \sfWidgetFormInputFile()]));
 $pf->embedForm('ef', $ef);
-$pf->bind(array('ef' => array(1 => 'f', 2 => 'potencier')), array('ef' => array(
-    'file' => array('name' => 'test1.txt', 'type' => 'text/plain', 'tmp_name' => '/tmp/test1.txt', 'error' => 0, 'size' => 100),
-)));
+$pf->bind(['ef' => [1 => 'f', 2 => 'potencier']], ['ef' => [
+    'file' => ['name' => 'test1.txt', 'type' => 'text/plain', 'tmp_name' => '/tmp/test1.txt', 'error' => 0, 'size' => 100],
+]]);
 $t->is($pf->getErrorSchema()->getCode(), 'ef [1 [min_length] file [max_size]]', '->bind() behaves correctly with files in embed form');
 
 // ->renderGlobalErrors()
 $t->diag('->renderGlobalErrors()');
-$f = new FormTest();
-$f->setValidatorSchema(new sfValidatorSchema(array(
-    'id' => new sfValidatorInteger(),
-    'first_name' => new sfValidatorString(array('min_length' => 2)),
-    'last_name' => new sfValidatorString(array('min_length' => 2)),
-)));
-$f->setWidgetSchema(new sfWidgetFormSchema(array(
-    'id' => new sfWidgetFormInputHidden(),
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-)));
-$f->bind(array(
+$f = new \FormTest();
+$f->setValidatorSchema(new \sfValidatorSchema([
+    'id' => new \sfValidatorInteger(),
+    'first_name' => new \sfValidatorString(['min_length' => 2]),
+    'last_name' => new \sfValidatorString(['min_length' => 2]),
+]));
+$f->setWidgetSchema(new \sfWidgetFormSchema([
+    'id' => new \sfWidgetFormInputHidden(),
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+]));
+$f->bind([
     'id' => 'dddd',
     'first_name' => 'f',
     'last_name' => 'potencier',
-));
+]);
 $output = <<<'EOF'
   <ul class="error_list">
     <li>Id: "dddd" is not an integer.</li>
@@ -500,17 +501,17 @@ public function configure()
 
 // ->render()
 $t->diag('->render()');
-$f = new FormTest(array('first_name' => 'Fabien', 'last_name' => 'Potencier'));
-$f->setValidators(array(
-    'id' => new sfValidatorInteger(),
-    'first_name' => new sfValidatorString(array('min_length' => 2)),
-    'last_name' => new sfValidatorString(array('min_length' => 2)),
-));
-$f->setWidgets(array(
-    'id' => new sfWidgetFormInputHidden(array('default' => 3)),
-    'first_name' => new sfWidgetFormInputText(array('default' => 'Thomas')),
-    'last_name' => new sfWidgetFormInputText(),
-));
+$f = new \FormTest(['first_name' => 'Fabien', 'last_name' => 'Potencier']);
+$f->setValidators([
+    'id' => new \sfValidatorInteger(),
+    'first_name' => new \sfValidatorString(['min_length' => 2]),
+    'last_name' => new \sfValidatorString(['min_length' => 2]),
+]);
+$f->setWidgets([
+    'id' => new \sfWidgetFormInputHidden(['default' => 3]),
+    'first_name' => new \sfWidgetFormInputText(['default' => 'Thomas']),
+    'last_name' => new \sfWidgetFormInputText(),
+]);
 
 // unbound
 $output = <<<'EOF'
@@ -536,17 +537,17 @@ public function configure()
 </tr>
 
 EOF;
-$t->is($f->render(array('first_name' => array('class' => 'foo'))), fix_linebreaks($output), '->render() renders the form as HTML');
+$t->is($f->render(['first_name' => ['class' => 'foo']]), fix_linebreaks($output), '->render() renders the form as HTML');
 $t->is((string) $f['id'], '<input type="hidden" name="id" value="3" id="id" />', '->offsetGet() returns a sfFormField');
 $t->is((string) $f['first_name'], '<input type="text" name="first_name" value="Fabien" id="first_name" />', '->offsetGet() returns a sfFormField');
 $t->is((string) $f['last_name'], '<input type="text" name="last_name" value="Potencier" id="last_name" />', '->offsetGet() returns a sfFormField');
 
 // bound
-$f->bind(array(
+$f->bind([
     'id' => '1',
     'first_name' => 'Fabien',
     'last_name' => 'Potencier',
-));
+]);
 $output = <<<'EOF'
 <tr>
   <th><label for="first_name">First name</label></th>
@@ -570,15 +571,15 @@ public function configure()
 </tr>
 
 EOF;
-$t->is($f->render(array('first_name' => array('class' => 'foo'))), fix_linebreaks($output), '->render() renders the form as HTML');
+$t->is($f->render(['first_name' => ['class' => 'foo']]), fix_linebreaks($output), '->render() renders the form as HTML');
 $t->is((string) $f['id'], '<input type="hidden" name="id" value="1" id="id" />', '->offsetGet() returns a sfFormField');
 $t->is((string) $f['first_name'], '<input type="text" name="first_name" value="Fabien" id="first_name" />', '->offsetGet() returns a sfFormField');
 $t->is((string) $f['last_name'], '<input type="text" name="last_name" value="Potencier" id="last_name" />', '->offsetGet() returns a sfFormField');
 
 // renderUsing()
 $t->diag('->renderUsing()');
-$f = new sfForm();
-$f->setWidgets(array('name' => new sfWidgetFormInputText()));
+$f = new \sfForm();
+$f->setWidgets(['name' => new \sfWidgetFormInputText()]);
 $output = <<<'EOF'
 <li>
   <label for="name">Name</label>
@@ -590,33 +591,33 @@ public function configure()
 $t->is($f->getWidgetSchema()->getFormFormatterName(), 'table', 'renderUsing() does not persist form formatter name for the current form instance');
 
 $w = $f->getWidgetSchema();
-$w->addFormFormatter('custom', new sfWidgetFormSchemaFormatterList($w));
+$w->addFormFormatter('custom', new \sfWidgetFormSchemaFormatterList($w));
 $t->is($f->renderUsing('custom'), fix_linebreaks($output), 'renderUsing() renders a custom form formatter');
 
 try {
     $f->renderUsing('nonexistant');
     $t->fail('renderUsing() throws an exception if formatter name does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('renderUsing() throws an exception if formatter name does not exist');
 }
 
 // renderHiddenFields()
 $t->diag('->renderHiddenFields()');
-$f = new sfForm();
-$f->setWidgets(array(
-    'id' => new sfWidgetFormInputHidden(),
-    'name' => new sfWidgetFormInputText(),
-    'is_admin' => new sfWidgetFormInputHidden(),
-));
+$f = new \sfForm();
+$f->setWidgets([
+    'id' => new \sfWidgetFormInputHidden(),
+    'name' => new \sfWidgetFormInputText(),
+    'is_admin' => new \sfWidgetFormInputHidden(),
+]);
 $output = '<input type="hidden" name="id" id="id" /><input type="hidden" name="is_admin" id="is_admin" />';
 $t->is($f->renderHiddenFields(), $output, 'renderHiddenFields() renders all hidden fields, no visible fields');
 $t->is(count($f->getFormFieldSchema()), 3, 'renderHiddenFields() does not modify the form fields');
 
-$author = new sfForm();
-$author->setWidgets(array('id' => new sfWidgetFormInputHidden(), 'name' => new sfWidgetFormInputText()));
+$author = new \sfForm();
+$author->setWidgets(['id' => new \sfWidgetFormInputHidden(), 'name' => new \sfWidgetFormInputText()]);
 
-$company = new sfForm();
-$company->setWidgets(array('id' => new sfWidgetFormInputHidden(), 'name' => new sfWidgetFormInputText()));
+$company = new \sfForm();
+$company->setWidgets(['id' => new \sfWidgetFormInputHidden(), 'name' => new \sfWidgetFormInputText()]);
 
 $author->embedForm('company', $company);
 
@@ -629,19 +630,19 @@ public function configure()
 // ->embedForm()
 $t->diag('->embedForm()');
 
-$author = new FormTest(array('first_name' => 'Fabien'));
-$author->setWidgetSchema($author_widget_schema = new sfWidgetFormSchema(array('first_name' => new sfWidgetFormInputText())));
-$author->setValidatorSchema($author_validator_schema = new sfValidatorSchema(array('first_name' => new sfValidatorString(array('min_length' => 2)))));
+$author = new \FormTest(['first_name' => 'Fabien']);
+$author->setWidgetSchema($author_widget_schema = new \sfWidgetFormSchema(['first_name' => new \sfWidgetFormInputText()]));
+$author->setValidatorSchema($author_validator_schema = new \sfValidatorSchema(['first_name' => new \sfValidatorString(['min_length' => 2])]));
 $author->addCSRFProtection(null);
 
-$company = new FormTest();
-$company->setWidgetSchema($company_widget_schema = new sfWidgetFormSchema(array('name' => new sfWidgetFormInputText())));
-$company->setValidatorSchema($company_validator_schema = new sfValidatorSchema(array('name' => new sfValidatorString(array('min_length' => 2)))));
+$company = new \FormTest();
+$company->setWidgetSchema($company_widget_schema = new \sfWidgetFormSchema(['name' => new \sfWidgetFormInputText()]));
+$company->setValidatorSchema($company_validator_schema = new \sfValidatorSchema(['name' => new \sfValidatorString(['min_length' => 2])]));
 $company->addCSRFProtection(null);
 
-$article = new FormTest();
-$article->setWidgetSchema($article_widget_schema = new sfWidgetFormSchema(array('title' => new sfWidgetFormInputText())));
-$article->setValidatorSchema($article_validator_schema = new sfValidatorSchema(array('title' => new sfValidatorString(array('min_length' => 2)))));
+$article = new \FormTest();
+$article->setWidgetSchema($article_widget_schema = new \sfWidgetFormSchema(['title' => new \sfWidgetFormInputText()]));
+$article->setValidatorSchema($article_validator_schema = new \sfValidatorSchema(['title' => new \sfValidatorString(['min_length' => 2])]));
 $article->addCSRFProtection(null);
 
 $author->embedForm('company', $company);
@@ -653,14 +654,14 @@ public function configure()
 
 $w->setNameFormat('article[%s]');
 
-$t->ok($v['author'] instanceof sfValidatorPass, '->embedForm() set validator pass');
+$t->ok($v['author'] instanceof \sfValidatorPass, '->embedForm() set validator pass');
 // ignore parents in comparison
 $w['author']['first_name']->setParent(null);
 $author_widget_schema['first_name']->setParent(null);
 $t->ok($w['author']['first_name'] == $author_widget_schema['first_name'], '->embedForm() embeds the widget schema');
 $t->is($d['author']['first_name'], 'Fabien', '->embedForm() merges default values from the embedded form');
-$t->is($w['author'][sfForm::getCSRFFieldName()], null, '->embedForm() removes the CSRF token for the embedded form');
-$t->ok(!isset($f['author'][sfForm::getCSRFFieldName()]), '->embedForm() removes the CSRF token for the embedded form');
+$t->is($w['author'][\sfForm::getCSRFFieldName()], null, '->embedForm() removes the CSRF token for the embedded form');
+$t->ok(!isset($f['author'][\sfForm::getCSRFFieldName()]), '->embedForm() removes the CSRF token for the embedded form');
 
 $t->is($w['author']->generateName('first_name'), 'article[author][first_name]', '->embedForm() changes the name format to reflect the embedding');
 $t->is($w['author']['company']->generateName('name'), 'article[author][company][name]', '->embedForm() changes the name format to reflect the embedding');
@@ -669,36 +670,36 @@ public function configure()
 $t->ok($author->getValidator('company') == $company_validator_schema, '->getValidator() gets a validator schema for an embedded form');
 
 try {
-    $author->setValidator('company', new sfValidatorPass());
+    $author->setValidator('company', new \sfValidatorPass());
     $t->fail('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
 }
 
 // tests for ticket #4754
-$f1 = new TestForm1();
-$f2 = new TestForm2();
+$f1 = new \TestForm1();
+$f2 = new \TestForm2();
 $f1->embedForm('f2', $f2);
 $t->is($f1['f2']['c']->render(), '<textarea rows="4" cols="30" name="f2[c]" id="f2_c"></textarea>', '->embedForm() generates a correct id in embedded form fields');
 $t->is($f1['f2']['c']->renderLabel(), '<label for="f2_c">2_c</label>', '->embedForm() generates a correct label id correctly in embedded form fields');
 
 // bind too many values for embedded forms
 $t->diag('bind too many values for embedded forms');
-$list = new FormTest();
-$list->setWidgets(array('title' => new sfWidgetFormInputText()));
-$list->setValidators(array('title' => new sfValidatorString()));
-$containerForm = new sfForm();
+$list = new \FormTest();
+$list->setWidgets(['title' => new \sfWidgetFormInputText()]);
+$list->setValidators(['title' => new \sfValidatorString()]);
+$containerForm = new \sfForm();
 $containerForm->embedForm('0', clone $list);
 $containerForm->embedForm('1', clone $list);
 $list->embedForm('items', $containerForm);
-$list->bind(array(
+$list->bind([
     'title' => 'list title',
-    'items' => array(
-        array('title' => 'item 1'),
-        array('title' => 'item 2'),
-        array('title' => 'extra item'),
-    ),
-));
+    'items' => [
+        ['title' => 'item 1'],
+        ['title' => 'item 2'],
+        ['title' => 'extra item'],
+    ],
+]);
 
 $t->isa_ok($list['items'][0]->getError(), 'sfValidatorErrorSchema', '"sfFormFieldSchema" is given an error schema when an extra embedded form is bound');
 
@@ -708,176 +709,176 @@ public function configure()
 
 // ->getEmbeddedForms()
 $t->diag('->getEmbeddedForms()');
-$article = new FormTest();
-$company = new FormTest();
-$author = new FormTest();
+$article = new \FormTest();
+$company = new \FormTest();
+$author = new \FormTest();
 $article->embedForm('company', $company);
 $article->embedForm('author', $author);
 $forms = $article->getEmbeddedForms();
-$t->is(array_keys($forms), array('company', 'author'), '->getEmbeddedForms() returns the embedded forms');
+$t->is(array_keys($forms), ['company', 'author'], '->getEmbeddedForms() returns the embedded forms');
 $t->is($forms['company'], $company, '->getEmbeddedForms() returns the embedded forms');
 $t->isa_ok($article->getEmbeddedForm('company'), 'FormTest', '->getEmbeddedForm() return an embedded form');
 
 try {
     $article->getEmbeddedForm('nonexistant');
     $t->fail('->getEmbeddedForm() throws an exception if the embedded form does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getEmbeddedForm() throws an exception if the embedded form does not exist');
 }
 
 // ::convertFileInformation()
 $t->diag('::convertFileInformation()');
-$input = array(
-    'file' => array(
+$input = [
+    'file' => [
         'name' => 'test1.txt',
         'type' => 'text/plain',
         'tmp_name' => '/tmp/test1.txt',
         'error' => 0,
         'size' => 100,
-    ),
-    'file1' => array(
+    ],
+    'file1' => [
         'name' => 'test2.txt',
         'type' => 'text/plain',
         'tmp_name' => '/tmp/test1.txt',
         'error' => 0,
         'size' => 200,
-    ),
-);
-$t->is_deeply(sfForm::convertFileInformation($input), $input, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
+    ],
+];
+$t->is_deeply(\sfForm::convertFileInformation($input), $input, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
 
-$input = array(
-    'article' => array(
-        'name' => array(
+$input = [
+    'article' => [
+        'name' => [
             'file1' => 'test1.txt',
             'file2' => 'test2.txt',
-        ),
-        'type' => array(
+        ],
+        'type' => [
             'file1' => 'text/plain',
             'file2' => 'text/plain',
-        ),
-        'tmp_name' => array(
+        ],
+        'tmp_name' => [
             'file1' => '/tmp/test1.txt',
             'file2' => '/tmp/test2.txt',
-        ),
-        'error' => array(
+        ],
+        'error' => [
             'file1' => 0,
             'file2' => 0,
-        ),
-        'size' => array(
+        ],
+        'size' => [
             'file1' => 100,
             'file2' => 200,
-        ),
-    ),
-);
-$expected = array(
-    'article' => array(
-        'file1' => array(
+        ],
+    ],
+];
+$expected = [
+    'article' => [
+        'file1' => [
             'name' => 'test1.txt',
             'type' => 'text/plain',
             'tmp_name' => '/tmp/test1.txt',
             'error' => 0,
             'size' => 100,
-        ),
-        'file2' => array(
+        ],
+        'file2' => [
             'name' => 'test2.txt',
             'type' => 'text/plain',
             'tmp_name' => '/tmp/test2.txt',
             'error' => 0,
             'size' => 200,
-        ),
-    ),
-);
-$t->is_deeply(sfForm::convertFileInformation($input), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
-$t->is_deeply(sfForm::convertFileInformation($expected), $expected, '::convertFileInformation() only changes the input array if needed');
-
-$input = array(
-    'file' => array(
+        ],
+    ],
+];
+$t->is_deeply(\sfForm::convertFileInformation($input), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
+$t->is_deeply(\sfForm::convertFileInformation($expected), $expected, '::convertFileInformation() only changes the input array if needed');
+
+$input = [
+    'file' => [
         'name' => 'test.txt',
         'type' => 'text/plain',
         'tmp_name' => '/tmp/test.txt',
         'error' => 0,
         'size' => 100,
-    ),
-    'article' => array(
-        'name' => array(
-            'name' => array(
+    ],
+    'article' => [
+        'name' => [
+            'name' => [
                 'name' => 'test1.txt',
-                'another' => array('file2' => 'test2.txt'),
-            ),
-        ),
-        'type' => array(
-            'name' => array(
+                'another' => ['file2' => 'test2.txt'],
+            ],
+        ],
+        'type' => [
+            'name' => [
                 'name' => 'text/plain',
-                'another' => array('file2' => 'text/plain'),
-            ),
-        ),
-        'tmp_name' => array(
-            'name' => array(
+                'another' => ['file2' => 'text/plain'],
+            ],
+        ],
+        'tmp_name' => [
+            'name' => [
                 'name' => '/tmp/test1.txt',
-                'another' => array('file2' => '/tmp/test2.txt'),
-            ),
-        ),
-        'error' => array(
-            'name' => array(
+                'another' => ['file2' => '/tmp/test2.txt'],
+            ],
+        ],
+        'error' => [
+            'name' => [
                 'name' => 0,
-                'another' => array('file2' => 0),
-            ),
-        ),
-        'size' => array(
-            'name' => array(
+                'another' => ['file2' => 0],
+            ],
+        ],
+        'size' => [
+            'name' => [
                 'name' => 100,
-                'another' => array('file2' => 200),
-            ),
-        ),
-    ),
-);
-$expected = array(
-    'file' => array(
+                'another' => ['file2' => 200],
+            ],
+        ],
+    ],
+];
+$expected = [
+    'file' => [
         'name' => 'test.txt',
         'type' => 'text/plain',
         'tmp_name' => '/tmp/test.txt',
         'error' => 0,
         'size' => 100,
-    ),
-    'article' => array(
-        'name' => array(
-            'name' => array(
+    ],
+    'article' => [
+        'name' => [
+            'name' => [
                 'name' => 'test1.txt',
                 'type' => 'text/plain',
                 'tmp_name' => '/tmp/test1.txt',
                 'error' => 0,
                 'size' => 100,
-            ),
-            'another' => array(
-                'file2' => array(
+            ],
+            'another' => [
+                'file2' => [
                     'name' => 'test2.txt',
                     'type' => 'text/plain',
                     'tmp_name' => '/tmp/test2.txt',
                     'error' => 0,
                     'size' => 200,
-                ),
-            ),
-        ),
-    ),
-);
-$t->is_deeply(sfForm::convertFileInformation($input), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
-$t->is_deeply(sfForm::convertFileInformation($expected), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
+                ],
+            ],
+        ],
+    ],
+];
+$t->is_deeply(\sfForm::convertFileInformation($input), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
+$t->is_deeply(\sfForm::convertFileInformation($expected), $expected, '::convertFileInformation() converts $_FILES to be coherent with $_GET and $_POST naming convention');
 
 // ->renderFormTag()
 $t->diag('->renderFormTag()');
-$f = new FormTest();
+$f = new \FormTest();
 $t->is($f->renderFormTag('/url'), '<form action="/url" method="post">', '->renderFormTag() renders the form tag');
-$t->is($f->renderFormTag('/url', array('method' => 'put')), '<form method="post" action="/url"><input type="hidden" name="sf_method" value="put" />', '->renderFormTag() adds a hidden input tag if the method is not GET or POST');
-$f->setWidgetSchema(new sfWidgetFormSchema(array('image' => new sfWidgetFormInputFile())));
+$t->is($f->renderFormTag('/url', ['method' => 'put']), '<form method="post" action="/url"><input type="hidden" name="sf_method" value="put" />', '->renderFormTag() adds a hidden input tag if the method is not GET or POST');
+$f->setWidgetSchema(new \sfWidgetFormSchema(['image' => new \sfWidgetFormInputFile()]));
 $t->is($f->renderFormTag('/url'), '<form action="/url" method="post" enctype="multipart/form-data">', '->renderFormTag() adds the enctype attribute if the form is multipart');
 
 // __clone()
 $t->diag('__clone()');
-$a = new FormTest();
-$a->setValidatorSchema(new sfValidatorSchema(array(
-    'first_name' => new sfValidatorString(array('min_length' => 2)),
-)));
-$a->bind(array('first_name' => 'F'));
+$a = new \FormTest();
+$a->setValidatorSchema(new \sfValidatorSchema([
+    'first_name' => new \sfValidatorString(['min_length' => 2]),
+]));
+$a->bind(['first_name' => 'F']);
 $a1 = clone $a;
 
 $t->ok($a1->getValidatorSchema() !== $a->getValidatorSchema(), '__clone() clones the validator schema');
@@ -892,35 +893,35 @@ public function configure()
 // mergeForm()
 $t->diag('mergeForm()');
 
-$f1 = new TestForm1();
-$f2 = new TestForm2();
+$f1 = new \TestForm1();
+$f2 = new \TestForm2();
 $f1->mergeForm($f2);
 
 $widgetSchema = $f1->getWidgetSchema();
 $validatorSchema = $f1->getValidatorSchema();
 $t->is(count($widgetSchema->getFields()), 4, 'mergeForm() merges a widget form schema');
 $t->is(count($validatorSchema->getFields()), 4, 'mergeForm() merges a validator schema');
-$t->is(array_keys($widgetSchema->getFields()), array('a', 'b', 'c', 'd'), 'mergeForms() merges the correct widgets');
-$t->is(array_keys($validatorSchema->getFields()), array('a', 'b', 'c', 'd'), 'mergeForms() merges the correct validators');
-$t->is($widgetSchema->getLabels(), array('a' => '1_a', 'b' => '1_b', 'c' => '2_c', 'd' => '2_d'), 'mergeForm() merges labels correctly');
-$t->is($widgetSchema->getHelps(), array('a' => '1_a', 'b' => '1_b', 'c' => '2_c', 'd' => '2_d'), 'mergeForm() merges helps correctly');
+$t->is(array_keys($widgetSchema->getFields()), ['a', 'b', 'c', 'd'], 'mergeForms() merges the correct widgets');
+$t->is(array_keys($validatorSchema->getFields()), ['a', 'b', 'c', 'd'], 'mergeForms() merges the correct validators');
+$t->is($widgetSchema->getLabels(), ['a' => '1_a', 'b' => '1_b', 'c' => '2_c', 'd' => '2_d'], 'mergeForm() merges labels correctly');
+$t->is($widgetSchema->getHelps(), ['a' => '1_a', 'b' => '1_b', 'c' => '2_c', 'd' => '2_d'], 'mergeForm() merges helps correctly');
 $t->isa_ok($widgetSchema['c'], 'sfWidgetFormTextarea', 'mergeForm() overrides original form widget');
 $t->isa_ok($validatorSchema['c'], 'sfValidatorPass', 'mergeForm() overrides original form validator');
 $t->isa_ok($validatorSchema->getPreValidator(), 'sfValidatorPass', 'mergeForm() merges pre validator');
 $t->isa_ok($validatorSchema->getPostValidator(), 'sfValidatorPass', 'mergeForm() merges post validator');
 
 try {
-    $f1->bind(array('a' => 'foo', 'b' => 'bar', 'd' => 'far_too_long_value'));
+    $f1->bind(['a' => 'foo', 'b' => 'bar', 'd' => 'far_too_long_value']);
     $f1->mergeForm($f2);
     $t->fail('mergeForm() disallows merging already bound forms');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('mergeForm() disallows merging already bound forms');
 }
 
 $errorSchema = $f1->getErrorSchema();
 $t->ok(array_key_exists('d', $errorSchema->getErrors()), 'mergeForm() merges errors after having been bound');
 
-$f1 = new TestForm1();
+$f1 = new \TestForm1();
 $f1->getWidgetSchema()->moveField('a', 'last');
 
 // is moved field well positioned when accessed with iterator interface? (#5551)
@@ -930,121 +931,121 @@ public function configure()
     break;
 }
 
-$f2 = new TestForm2();
+$f2 = new \TestForm2();
 $f2->mergeForm($f1);
 
-$t->is_deeply(array_keys($f2->getWidgetSchema()->getFields()), array('c', 'd', 'b', 'a'), 'mergeForm() merges fields in the correct order');
+$t->is_deeply(array_keys($f2->getWidgetSchema()->getFields()), ['c', 'd', 'b', 'a'], 'mergeForm() merges fields in the correct order');
 
-$f1 = new NumericFieldsForm(array('5' => 'default1'), array('salt' => '1'));
-$f2 = new NumericFieldsForm(array('5' => 'default2'), array('salt' => '2'));
+$f1 = new \NumericFieldsForm(['5' => 'default1'], ['salt' => '1']);
+$f2 = new \NumericFieldsForm(['5' => 'default2'], ['salt' => '2']);
 $f1->mergeForm($f2);
 
-$t->is_deeply($f1->getDefaults(), array('5' => 'default2'), '->mergeForm() merges numeric defaults');
-$t->is_deeply($f1->getWidgetSchema()->getLabels(), array('5' => 'label2'), '->mergeForm() merges numeric labels');
-$t->is_deeply($f1->getWidgetSchema()->getHelps(), array('5' => 'help2'), '->mergeForm() merges numeric helps');
+$t->is_deeply($f1->getDefaults(), ['5' => 'default2'], '->mergeForm() merges numeric defaults');
+$t->is_deeply($f1->getWidgetSchema()->getLabels(), ['5' => 'label2'], '->mergeForm() merges numeric labels');
+$t->is_deeply($f1->getWidgetSchema()->getHelps(), ['5' => 'help2'], '->mergeForm() merges numeric helps');
 
 // ->getJavaScripts() ->getStylesheets()
 $t->diag('->getJavaScripts() ->getStylesheets()');
 
-class MyWidget extends sfWidgetForm
+class MyWidget extends \sfWidgetForm
 {
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return null;
     }
 
     public function getJavaScripts()
     {
-        return array('/path/to/a/'.$this->getOption('name').'.js');
+        return ['/path/to/a/'.$this->getOption('name').'.js'];
     }
 
     public function getStylesheets()
     {
-        return array('/path/to/a/'.$this->getOption('name').'.css' => 'all');
+        return ['/path/to/a/'.$this->getOption('name').'.css' => 'all'];
     }
 
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('name');
     }
 }
 
-$f = new FormTest();
-$f->setWidgets(array(
-    'foo' => new MyWidget(array('name' => 'foo')),
-    'bar' => new MyWidget(array('name' => 'bar')),
-));
-$t->is($f->getJavaScripts(), array('/path/to/a/foo.js', '/path/to/a/bar.js'), '->getJavaScripts() returns the stylesheets of all widgets');
-$t->is($f->getStylesheets(), array('/path/to/a/foo.css' => 'all', '/path/to/a/bar.css' => 'all'), '->getStylesheets() returns the JavaScripts of all widgets');
+$f = new \FormTest();
+$f->setWidgets([
+    'foo' => new \MyWidget(['name' => 'foo']),
+    'bar' => new \MyWidget(['name' => 'bar']),
+]);
+$t->is($f->getJavaScripts(), ['/path/to/a/foo.js', '/path/to/a/bar.js'], '->getJavaScripts() returns the stylesheets of all widgets');
+$t->is($f->getStylesheets(), ['/path/to/a/foo.css' => 'all', '/path/to/a/bar.css' => 'all'], '->getStylesheets() returns the JavaScripts of all widgets');
 
 // ->getFormFieldSchema()
 $t->diag('->getFormFieldSchema()');
 
-$f = new NumericFieldsForm(array('5' => 'default'));
-$t->is_deeply($f->getFormFieldSchema()->getValue(), array('5' => 'default'), '->getFormFieldSchema() includes default numeric fields');
-$f->bind(array('5' => 'bound'));
-$t->is_deeply($f->getFormFieldSchema()->getValue(), array('5' => 'bound'), '->getFormFieldSchema() includes bound numeric fields');
+$f = new \NumericFieldsForm(['5' => 'default']);
+$t->is_deeply($f->getFormFieldSchema()->getValue(), ['5' => 'default'], '->getFormFieldSchema() includes default numeric fields');
+$f->bind(['5' => 'bound']);
+$t->is_deeply($f->getFormFieldSchema()->getValue(), ['5' => 'bound'], '->getFormFieldSchema() includes bound numeric fields');
 
 // ->getErrors()
 $t->diag('->getErrors()');
 
-$f1 = new TestForm1();
-$f21 = new TestForm1();
-$f2 = new TestForm2();
+$f1 = new \TestForm1();
+$f21 = new \TestForm1();
+$f2 = new \TestForm2();
 $f2->embedForm('F21', $f21);
 $f1->embedForm('F2', $f2);
-$f1->bind(array());
-$expected = array(
+$f1->bind([]);
+$expected = [
     '1_a' => 'Required.',
     '1_b' => 'Required.',
     '1_c' => 'Required.',
-    'F2' => array(
+    'F2' => [
         '2_d' => 'Required.',
-        'F21' => array(
+        'F21' => [
             '1_a' => 'Required.',
             '1_b' => 'Required.',
             '1_c' => 'Required.',
-        ),
-    ),
-);
+        ],
+    ],
+];
 
 $t->is($f1->getErrors(), $expected, '->getErrors() return array of errors');
 
 // bind with a simulated file upload in the POST array
-$f = new FormTest();
+$f = new \FormTest();
 
 try {
-    $f->bind(array(
-        'file' => array(
+    $f->bind([
+        'file' => [
             'name' => 'foo.txt',
             'type' => 'text/plain',
             'tmp_name' => 'somefile',
             'error' => 0,
             'size' => 10,
-        ),
-    ));
+        ],
+    ]);
     $t->fail('Cannot fake a file upload with a POST');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('Cannot fake a file upload with a POST');
 }
 
-$f = new FormTest();
+$f = new \FormTest();
 
 try {
-    $f->bind(array(
-        'foo' => array(
-            'bar' => array(
-                'file' => array(
+    $f->bind([
+        'foo' => [
+            'bar' => [
+                'file' => [
                     'name' => 'foo.txt',
                     'type' => 'text/plain',
                     'tmp_name' => 'somefile',
                     'error' => 0,
                     'size' => 10,
-                ),
-            ),
-        ),
-    ));
+                ],
+            ],
+        ],
+    ]);
     $t->fail('Cannot fake a file upload with a POST');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('Cannot fake a file upload with a POST');
 }
diff --git a/test/unit/generator/sfGeneratorTest.php b/test/unit/generator/sfGeneratorTest.php
index e2f48bd1c..9561af789 100644
--- a/test/unit/generator/sfGeneratorTest.php
+++ b/test/unit/generator/sfGeneratorTest.php
@@ -1,27 +1,28 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license information, please generator the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(0);
+$t = new \lime_test(0);
 
-class myGenerator extends sfGenerator
+class myGenerator extends \sfGenerator
 {
-    public function generate($params = array())
+    public function generate($params = [])
     {
     }
 }
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
 }
 
-$manager = new sfGeneratorManager(new ProjectConfiguration());
-$generator = new myGenerator($manager);
+$manager = new \sfGeneratorManager(new \ProjectConfiguration());
+$generator = new \myGenerator($manager);
diff --git a/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php b/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
index 47a457d8d..4c7bd18fc 100644
--- a/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
+++ b/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
@@ -1,36 +1,37 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
  *
- * For the full copyright and license information, please generator the LICENSE
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(12);
+$t = new \lime_test(12);
 
 // ->isPartial() ->isComponent() ->isLink()
 $t->diag('->isPartial() ->isComponent() ->isLink()');
 
-$field = new sfModelGeneratorConfigurationField('my_field', array());
+$field = new \sfModelGeneratorConfigurationField('my_field', []);
 $t->is($field->isPartial(), false, '->isPartial() defaults to false');
 $t->is($field->isComponent(), false, '->isComponent() defaults to false');
 $t->is($field->isLink(), false, '->isLink() defaults to false');
 
-$field = new sfModelGeneratorConfigurationField('my_field', array('flag' => '_'));
+$field = new \sfModelGeneratorConfigurationField('my_field', ['flag' => '_']);
 $t->is($field->isPartial(), true, '->isPartial() returns true if flag is "_"');
 $t->is($field->isComponent(), false, '->isComponent() defaults to false');
 $t->is($field->isLink(), false, '->isLink() defaults to false');
 
-$field = new sfModelGeneratorConfigurationField('my_field', array('flag' => '~'));
+$field = new \sfModelGeneratorConfigurationField('my_field', ['flag' => '~']);
 $t->is($field->isPartial(), false, '->isPartial() defaults to false');
 $t->is($field->isComponent(), true, '->isComponent() returns true if flag is "~"');
 $t->is($field->isLink(), false, '->isLink() defaults to false');
 
-$field = new sfModelGeneratorConfigurationField('my_field', array('flag' => '='));
+$field = new \sfModelGeneratorConfigurationField('my_field', ['flag' => '=']);
 $t->is($field->isPartial(), false, '->isPartial() defaults to false');
 $t->is($field->isComponent(), false, '->isComponent() defaults to false');
 $t->is($field->isLink(), true, '->isLink() returns true if flag is "="');
diff --git a/test/unit/helper/AssetHelperTest.php b/test/unit/helper/AssetHelperTest.php
index 7d78f3d5b..a9ed65aa5 100644
--- a/test/unit/helper/AssetHelperTest.php
+++ b/test/unit/helper/AssetHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +19,7 @@
 
 require_once __DIR__.'/../../../lib/helper/AssetHelper.php';
 
-$t = new lime_test(68);
+$t = new \lime_test(68);
 
 class myRequest
 {
@@ -40,24 +41,24 @@ public function getHost()
     }
 }
 
-class myResponse extends sfWebResponse
+class myResponse extends \sfWebResponse
 {
     public function resetAssets()
     {
-        $this->javascripts = array_combine($this->positions, array_fill(0, count($this->positions), array()));
-        $this->stylesheets = array_combine($this->positions, array_fill(0, count($this->positions), array()));
+        $this->javascripts = array_combine($this->positions, array_fill(0, count($this->positions), []));
+        $this->stylesheets = array_combine($this->positions, array_fill(0, count($this->positions), []));
     }
 }
 
 class myController
 {
-    public function genUrl($parameters = array(), $absolute = false)
+    public function genUrl($parameters = [], $absolute = false)
     {
         return ($absolute ? '/' : '').$parameters;
     }
 }
 
-$context = sfContext::getInstance(array('request' => 'myRequest', 'response' => 'myResponse', 'controller' => 'myController'));
+$context = \sfContext::getInstance(['request' => 'myRequest', 'response' => 'myResponse', 'controller' => 'myController']);
 
 // _compute_public_path()
 $t->diag('_compute_public_path');
@@ -78,12 +79,12 @@ public function genUrl($parameters = array(), $absolute = false)
 $t->is(image_tag('/images/test.png'), '<img src="/images/test.png" />', 'image_tag() can take an absolute image path');
 $t->is(image_tag('/images/test'), '<img src="/images/test.png" />', 'image_tag() can take an absolute image path without extension');
 $t->is(image_tag('test.jpg'), '<img src="/images/test.jpg" />', 'image_tag() can take an image name with an extension');
-$t->is(image_tag('test', array('alt' => 'Foo')), '<img alt="Foo" src="/images/test.png" />', 'image_tag() takes an array of options as its second argument to override alt');
-$t->is(image_tag('test', array('size' => '10x10')), '<img src="/images/test.png" height="10" width="10" />', 'image_tag() takes a size option');
-$t->is(image_tag('test', array('absolute' => true)), '<img src="http://localhost/images/test.png" />', 'image_tag() can take an absolute parameter');
-$t->is(image_tag('test', array('class' => 'bar')), '<img class="bar" src="/images/test.png" />', 'image_tag() takes whatever option you want');
-$t->is(image_tag('test', array('alt_title' => 'Foo')), '<img src="/images/test.png" alt="Foo" title="Foo" />', 'image_tag() takes an array of options as its second argument to create alt and title');
-$t->is(image_tag('test', array('alt_title' => 'Foo', 'title' => 'Bar')), '<img title="Bar" src="/images/test.png" alt="Foo" />', 'image_tag() takes an array of options as its second argument to create alt and title');
+$t->is(image_tag('test', ['alt' => 'Foo']), '<img alt="Foo" src="/images/test.png" />', 'image_tag() takes an array of options as its second argument to override alt');
+$t->is(image_tag('test', ['size' => '10x10']), '<img src="/images/test.png" height="10" width="10" />', 'image_tag() takes a size option');
+$t->is(image_tag('test', ['absolute' => true]), '<img src="http://localhost/images/test.png" />', 'image_tag() can take an absolute parameter');
+$t->is(image_tag('test', ['class' => 'bar']), '<img class="bar" src="/images/test.png" />', 'image_tag() takes whatever option you want');
+$t->is(image_tag('test', ['alt_title' => 'Foo']), '<img src="/images/test.png" alt="Foo" title="Foo" />', 'image_tag() takes an array of options as its second argument to create alt and title');
+$t->is(image_tag('test', ['alt_title' => 'Foo', 'title' => 'Bar']), '<img title="Bar" src="/images/test.png" alt="Foo" />', 'image_tag() takes an array of options as its second argument to create alt and title');
 
 // stylesheet_tag()
 $t->diag('stylesheet_tag()');
@@ -99,22 +100,22 @@ public function genUrl($parameters = array(), $absolute = false)
     'stylesheet_tag() can takes n stylesheet names as its arguments'
 );
 $t->is(
-    stylesheet_tag('style', array('media' => 'all')),
+    stylesheet_tag('style', ['media' => 'all']),
     '<link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />'."\n",
     'stylesheet_tag() can take a media option'
 );
 $t->is(
-    stylesheet_tag('style', array('absolute' => true)),
+    stylesheet_tag('style', ['absolute' => true]),
     '<link rel="stylesheet" type="text/css" media="screen" href="http://localhost/css/style.css" />'."\n",
     'stylesheet_tag() can take an absolute option to output an absolute file name'
 );
 $t->is(
-    stylesheet_tag('style', array('raw_name' => true)),
+    stylesheet_tag('style', ['raw_name' => true]),
     '<link rel="stylesheet" type="text/css" media="screen" href="style" />'."\n",
     'stylesheet_tag() can take a raw_name option to bypass file name decoration'
 );
 $t->is(
-    stylesheet_tag('style', array('condition' => 'IE 6')),
+    stylesheet_tag('style', ['condition' => 'IE 6']),
     '<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" /><![endif]-->'."\n",
     'stylesheet_tag() can take a condition option'
 );
@@ -133,22 +134,22 @@ public function genUrl($parameters = array(), $absolute = false)
     'javascript_include_tag() can takes n javascript file names as its arguments'
 );
 $t->is(
-    javascript_include_tag('xmlhr', array('absolute' => true)),
+    javascript_include_tag('xmlhr', ['absolute' => true]),
     '<script type="text/javascript" src="http://localhost/js/xmlhr.js"></script>'."\n",
     'javascript_include_tag() can take an absolute option to output an absolute file name'
 );
 $t->is(
-    javascript_include_tag('xmlhr', array('raw_name' => true)),
+    javascript_include_tag('xmlhr', ['raw_name' => true]),
     '<script type="text/javascript" src="xmlhr"></script>'."\n",
     'javascript_include_tag() can take a raw_name option to bypass file name decoration'
 );
 $t->is(
-    javascript_include_tag('xmlhr', array('defer' => 'defer')),
+    javascript_include_tag('xmlhr', ['defer' => 'defer']),
     '<script type="text/javascript" src="/js/xmlhr.js" defer="defer"></script>'."\n",
     'javascript_include_tag() can take additional html options like defer'
 );
 $t->is(
-    javascript_include_tag('xmlhr', array('condition' => 'IE 6')),
+    javascript_include_tag('xmlhr', ['condition' => 'IE 6']),
     '<!--[if IE 6]><script type="text/javascript" src="/js/xmlhr.js"></script><![endif]-->'."\n",
     'javascript_include_tag() can take a condition option'
 );
@@ -182,13 +183,13 @@ public function genUrl($parameters = array(), $absolute = false)
     '<script type="text/javascript" src="/js/xmlhr.js"></script>'."\n",
     'get_javascripts() returns a javascript previously added by use_javascript()'
 );
-use_javascript('xmlhr', '', array('raw_name' => true));
+use_javascript('xmlhr', '', ['raw_name' => true]);
 $t->is(
     get_javascripts(),
     '<script type="text/javascript" src="xmlhr"></script>'."\n",
     'use_javascript() accepts an array of options as a third parameter'
 );
-use_javascript('xmlhr', '', array('absolute' => true));
+use_javascript('xmlhr', '', ['absolute' => true]);
 $t->is(
     get_javascripts(),
     '<script type="text/javascript" src="http://localhost/js/xmlhr.js"></script>'."\n",
@@ -210,13 +211,13 @@ public function genUrl($parameters = array(), $absolute = false)
     '<link rel="stylesheet" type="text/css" media="screen" href="/css/style.css" />'."\n",
     'get_stylesheets() returns a stylesheet previously added by use_stylesheet()'
 );
-use_stylesheet('style', '', array('raw_name' => true));
+use_stylesheet('style', '', ['raw_name' => true]);
 $t->is(
     get_stylesheets(),
     '<link rel="stylesheet" type="text/css" media="screen" href="style" />'."\n",
     'use_stylesheet() accepts an array of options as a third parameter'
 );
-use_stylesheet('style', '', array('absolute' => true));
+use_stylesheet('style', '', ['absolute' => true]);
 $t->is(
     get_stylesheets(),
     '<link rel="stylesheet" type="text/css" media="screen" href="http://localhost/css/style.css" />'."\n",
@@ -240,9 +241,9 @@ public function genUrl($parameters = array(), $absolute = false)
 $t->diag('dynamic_javascript_include_tag()');
 $t->is(dynamic_javascript_include_tag('module/action'), '<script type="text/javascript" src="module/action?sf_format=js"></script>'."\n", 'dynamic_javascript_include_tag() returns a tag relative to the given action');
 $t->is(dynamic_javascript_include_tag('module/action', true), '<script type="text/javascript" src="/module/action?sf_format=js"></script>'."\n", 'dynamic_javascript_include_tag() takes an absolute boolean as its second argument');
-$t->is(dynamic_javascript_include_tag('module/action', true, array('class' => 'foo')), '<script type="text/javascript" src="/module/action?sf_format=js" class="foo"></script>'."\n", 'dynamic_javascript_include_tag() takes an array of HTML attributes as its third argument');
+$t->is(dynamic_javascript_include_tag('module/action', true, ['class' => 'foo']), '<script type="text/javascript" src="/module/action?sf_format=js" class="foo"></script>'."\n", 'dynamic_javascript_include_tag() takes an array of HTML attributes as its third argument');
 
-$context->response = new myResponse($context->getEventDispatcher());
+$context->response = new \myResponse($context->getEventDispatcher());
 
 // use_dynamic_javascript()
 $t->diag('use_dynamic_javascript()');
@@ -262,22 +263,22 @@ public function genUrl($parameters = array(), $absolute = false)
     'use_dynamic_stylesheet() register a dynamic stylesheet in the response'
 );
 
-class MyForm extends sfForm
+class MyForm extends \sfForm
 {
     public function getStylesheets()
     {
-        return array('/path/to/a/foo.css' => 'all', '/path/to/a/bar.css' => 'print');
+        return ['/path/to/a/foo.css' => 'all', '/path/to/a/bar.css' => 'print'];
     }
 
     public function getJavaScripts()
     {
-        return array('/path/to/a/foo.js', '/path/to/a/bar.js');
+        return ['/path/to/a/foo.js', '/path/to/a/bar.js'];
     }
 }
 
 // get_javascripts_for_form() get_stylesheets_for_form()
 $t->diag('get_javascripts_for_form() get_stylesheets_for_form()');
-$form = new MyForm();
+$form = new \MyForm();
 $output = <<<'EOF'
 <script type="text/javascript" src="/path/to/a/foo.js"></script>
 <script type="text/javascript" src="/path/to/a/bar.js"></script>
@@ -294,21 +295,21 @@ public function getJavaScripts()
 // use_javascripts_for_form() use_stylesheets_for_form()
 $t->diag('use_javascripts_for_form() use_stylesheets_for_form()');
 
-$response = sfContext::getInstance()->getResponse();
-$form = new MyForm();
+$response = \sfContext::getInstance()->getResponse();
+$form = new \MyForm();
 
 $response->resetAssets();
 use_stylesheets_for_form($form);
-$t->is_deeply($response->getStylesheets(), array('/path/to/a/foo.css' => array('media' => 'all'), '/path/to/a/bar.css' => array('media' => 'print')), 'use_stylesheets_for_form() adds stylesheets to the response');
+$t->is_deeply($response->getStylesheets(), ['/path/to/a/foo.css' => ['media' => 'all'], '/path/to/a/bar.css' => ['media' => 'print']], 'use_stylesheets_for_form() adds stylesheets to the response');
 
 $response->resetAssets();
 use_javascripts_for_form($form);
-$t->is_deeply($response->getJavaScripts(), array('/path/to/a/foo.js' => array(), '/path/to/a/bar.js' => array()), 'use_javascripts_for_form() adds javascripts to the response');
+$t->is_deeply($response->getJavaScripts(), ['/path/to/a/foo.js' => [], '/path/to/a/bar.js' => []], 'use_javascripts_for_form() adds javascripts to the response');
 
 // custom web paths
 $t->diag('Custom asset path handling');
 
-sfConfig::set('sf_web_js_dir_name', 'static/js');
+\sfConfig::set('sf_web_js_dir_name', 'static/js');
 $t->is(javascript_path('xmlhr'), '/static/js/xmlhr.js', 'javascript_path() decorates a relative filename with js dir name and extension with custom js dir');
 $t->is(
     javascript_include_tag('xmlhr'),
@@ -316,7 +317,7 @@ public function getJavaScripts()
     'javascript_include_tag() takes a javascript name as its first argument'
 );
 
-sfConfig::set('sf_web_css_dir_name', 'static/css');
+\sfConfig::set('sf_web_css_dir_name', 'static/css');
 $t->is(stylesheet_path('style'), '/static/css/style.css', 'stylesheet_path() decorates a relative filename with css dir name and extension with custom css dir');
 $t->is(
     stylesheet_tag('style'),
@@ -324,6 +325,6 @@ public function getJavaScripts()
     'stylesheet_tag() takes a stylesheet name as its first argument'
 );
 
-sfConfig::set('sf_web_images_dir_name', 'static/img');
+\sfConfig::set('sf_web_images_dir_name', 'static/img');
 $t->is(image_path('img'), '/static/img/img.png', 'image_path() decorates a relative filename with images dir name and png extension with custom images dir');
 $t->is(image_tag('test'), '<img src="/static/img/test.png" />', 'image_tag() takes an image name as its first argument');
diff --git a/test/unit/helper/DateHelperTest.php b/test/unit/helper/DateHelperTest.php
index 8338ad984..687bed524 100644
--- a/test/unit/helper/DateHelperTest.php
+++ b/test/unit/helper/DateHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(592);
+$t = new \lime_test(592);
 
 class sfUser
 {
@@ -24,9 +25,9 @@ public function getCulture()
     }
 }
 
-sfConfig::set('sf_charset', 'utf-8');
+\sfConfig::set('sf_charset', 'utf-8');
 
-$context = sfContext::getInstance(array('user' => 'sfUser'));
+$context = \sfContext::getInstance(['user' => 'sfUser']);
 
 require_once __DIR__.'/../../../lib/helper/UrlHelper.php';
 
@@ -91,16 +92,16 @@ public function getCulture()
 $t->is(format_datetime(date('Y-m-d H:i:s', $now), 'f'), date('F j, Y g:i A', $now), 'formats timestamps correctly');
 
 $t->diag('sfDateFormat');
-$df = new sfDateFormat('en_US');
+$df = new \sfDateFormat('en_US');
 $t->is($df->format('7/14/1789', 'i', 'd'), '1789-07-14', 'pre-epoch date from en_US to iso');
 $t->is($df->format('7/14/1789 14:29', 'I', $df->getInputPattern('g')), '1789-07-14 14:29:00', 'pre-epoch date-time from en_US to iso with getInputPattern()');
-$df = new sfDateFormat('fr');
+$df = new \sfDateFormat('fr');
 $t->is($df->format(date('d/m/y', $now), 'i', 'd'), date('Y-m-d', $now), 'format two digit year from fr to iso');
 
-$cultures = sfCultureInfo::getCultures();
+$cultures = \sfCultureInfo::getCultures();
 foreach ($cultures as $culture) {
-    if (sfCultureInfo::validCulture($culture)) {
-        $df = new sfDateFormat($culture);
+    if (\sfCultureInfo::validCulture($culture)) {
+        $df = new \sfDateFormat($culture);
         $shortDate = $df->format($now, 'd');
         $t->is($df->format($shortDate, 'i', 'd'), date('Y-m-d', $now), sprintf('"%s": conversion "d" to "i"', $culture));
         $dateTime = $df->format($now, $df->getInputPattern('g'));
diff --git a/test/unit/helper/EscapingHelperTest.php b/test/unit/helper/EscapingHelperTest.php
index 012c228fb..fde690cfc 100644
--- a/test/unit/helper/EscapingHelperTest.php
+++ b/test/unit/helper/EscapingHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +13,9 @@
 
 require_once __DIR__.'/../../../lib/helper/EscapingHelper.php';
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
-sfConfig::set('sf_charset', 'UTF-8');
+\sfConfig::set('sf_charset', 'UTF-8');
 
 // esc_entities()
 $t->diag('esc_entities()');
diff --git a/test/unit/helper/JavascriptBaseHelperTest.php b/test/unit/helper/JavascriptBaseHelperTest.php
index e72ca3056..49df19676 100644
--- a/test/unit/helper/JavascriptBaseHelperTest.php
+++ b/test/unit/helper/JavascriptBaseHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +15,7 @@
 
 require_once __DIR__.'/../../../lib/helper/JavascriptBaseHelper.php';
 
-$t = new lime_test(9, new lime_output_color());
+$t = new \lime_test(9, new \lime_output_color());
 
 // boolean_for_javascript()
 $t->diag('boolean_for_javascript()');
@@ -25,8 +26,8 @@
 
 // options_for_javascript()
 $t->diag('options_for_javascript()');
-$t->is(options_for_javascript(array("'a'" => "'b'", "'c'" => false)), "{'a':'b', 'c':false}", 'options_for_javascript() makes a javascript representation of the passed array');
-$t->is(options_for_javascript(array("'a'" => array("'b'" => "'c'"))), "{'a':{'b':'c'}}", 'options_for_javascript() works with nested arrays');
+$t->is(options_for_javascript(["'a'" => "'b'", "'c'" => false]), "{'a':'b', 'c':false}", 'options_for_javascript() makes a javascript representation of the passed array');
+$t->is(options_for_javascript(["'a'" => ["'b'" => "'c'"]]), "{'a':{'b':'c'}}", 'options_for_javascript() works with nested arrays');
 
 // javascript_tag()
 $t->diag('javascript_tag()');
@@ -43,4 +44,4 @@
 $t->diag('link_to_function()');
 $t->is(link_to_function('foo', 'alert(\'bar\')'), '<a href="#" onclick="alert(\'bar\'); return false;">foo</a>', 'link_to_function generates a link with onClick handler for function');
 // #4152
-$t->is(link_to_function('foo', 'alert(\'bar\')', array('confirm' => 'sure?')), '<a href="#" onclick="if(window.confirm(\'sure?\')){ alert(\'bar\');}; return false;">foo</a>', 'link_to_function works fine with confirm dialog');
+$t->is(link_to_function('foo', 'alert(\'bar\')', ['confirm' => 'sure?']), '<a href="#" onclick="if(window.confirm(\'sure?\')){ alert(\'bar\');}; return false;">foo</a>', 'link_to_function works fine with confirm dialog');
diff --git a/test/unit/helper/NumberHelperTest.php b/test/unit/helper/NumberHelperTest.php
index 3f70110d8..84e2c7c65 100644
--- a/test/unit/helper/NumberHelperTest.php
+++ b/test/unit/helper/NumberHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 require_once __DIR__.'/../../../lib/helper/NumberHelper.php';
 
-$t = new lime_test(12);
+$t = new \lime_test(12);
 
 // format_number()
 $t->diag('format_number()');
diff --git a/test/unit/helper/PartialHelperTest.php b/test/unit/helper/PartialHelperTest.php
index aeaaf915e..df6d0913e 100644
--- a/test/unit/helper/PartialHelperTest.php
+++ b/test/unit/helper/PartialHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,9 +17,9 @@
 
 // Fixme: make this test more beautiful and extend it
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
-class MyTestPartialView extends sfPartialView
+class MyTestPartialView extends \sfPartialView
 {
     public function render()
     {
@@ -35,13 +36,13 @@ public function setPartialVars(array $partialVars)
 }
 
 $t->diag('get_partial()');
-sfConfig::set('mod_module_partial_view_class', 'MyTest');
+\sfConfig::set('mod_module_partial_view_class', 'MyTest');
 
 $t->is(get_partial('module/dummy'), '==RENDERED==', 'get_partial() uses the class specified in partial_view_class for the given module');
 $t->is(get_partial('MODULE/dummy'), '==RENDERED==', 'get_partial() accepts a case-insensitive module name');
 
 // slots tests
-sfContext::getInstance()->inject('response', 'sfWebResponse');
+\sfContext::getInstance()->inject('response', 'sfWebResponse');
 
 $t->diag('get_slot()');
 $t->is(get_slot('foo', 'baz'), 'baz', 'get_slot() retrieves default slot content');
diff --git a/test/unit/helper/TagHelperTest.php b/test/unit/helper/TagHelperTest.php
index efec8f6a7..78c7b54ed 100644
--- a/test/unit/helper/TagHelperTest.php
+++ b/test/unit/helper/TagHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +13,9 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(21);
+$t = new \lime_test(21);
 
-$context = sfContext::getInstance();
+$context = \sfContext::getInstance();
 
 require_once __DIR__.'/../../../lib/helper/TagHelper.php';
 
@@ -23,9 +24,9 @@
 $t->is(tag(''), '', 'tag() returns an empty string with empty input');
 $t->is(tag('br'), '<br />', 'tag() takes a tag as its first parameter');
 $t->is(tag('p', null, true), '<p>', 'tag() takes a boolean parameter as its third parameter');
-$t->is(tag('br', array('class' => 'foo'), false), '<br class="foo" />', 'tag() takes an array of options as its second parameters');
+$t->is(tag('br', ['class' => 'foo'], false), '<br class="foo" />', 'tag() takes an array of options as its second parameters');
 $t->is(tag('br', 'class=foo', false), '<br class="foo" />', 'tag() takes a string of options as its second parameters');
-$t->is(tag('p', array('class' => 'foo', 'id' => 'bar'), true), '<p class="foo" id="bar">', 'tag() takes a boolean parameter as its third parameter');
+$t->is(tag('p', ['class' => 'foo', 'id' => 'bar'], true), '<p class="foo" id="bar">', 'tag() takes a boolean parameter as its third parameter');
 // $t->is(tag('br', array('class' => '"foo"')), '<br class="&quot;foo&quot;" />');
 
 // content_tag()
@@ -46,10 +47,10 @@
 
 // _get_option()
 $t->diag('_get_option()');
-$options = array(
+$options = [
     'foo' => 'bar',
     'bar' => 'foo',
-);
+];
 $t->is(_get_option($options, 'foo'), 'bar', '_get_option() returns the value for the given key');
 $t->ok(!isset($options['foo']), '_get_option() removes the key from the original array');
 $t->is(_get_option($options, 'nofoo', 'nobar'), 'nobar', '_get_option() returns the default value if the key does not exist');
diff --git a/test/unit/helper/TestObject.php b/test/unit/helper/TestObject.php
index a20c98ed2..91789aed6 100644
--- a/test/unit/helper/TestObject.php
+++ b/test/unit/helper/TestObject.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/test/unit/helper/TextHelperTest.php b/test/unit/helper/TextHelperTest.php
index b956d2182..26639c0bf 100644
--- a/test/unit/helper/TextHelperTest.php
+++ b/test/unit/helper/TextHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +15,7 @@
 
 require_once __DIR__.'/../../../lib/helper/TextHelper.php';
 
-$t = new lime_test(60);
+$t = new \lime_test(60);
 
 // truncate_text()
 $t->diag('truncate_text()');
@@ -146,8 +147,8 @@
 $t->is(auto_link_text('<p>Link '.$link2_raw.'</p>'), '<p>Link '.$link2_result.'</p>', 'auto_link_text() converts URLs to links');
 $t->is(auto_link_text('<p>'.$link2_raw.' Link</p>'), '<p>'.$link2_result.' Link</p>', 'auto_link_text() converts URLs to links');
 $t->is(auto_link_text('<p>http://www.google.com/?q=symfony Link</p>'), '<p><a href="http://www.google.com/?q=symfony">http://www.google.com/?q=symfony</a> Link</p>', 'auto_link_text() converts URLs to links');
-$t->is(auto_link_text('<p>http://www.google.com/?q=symfony+link</p>', 'all', array(), true), '<p><a href="http://www.google.com/?q=symfony+link">http://www.google.com/?q=symfony+li...</a></p>', 'auto_link_text() truncates URLs in links');
-$t->is(auto_link_text('<p>http://www.google.com/?q=symfony+link</p>', 'all', array(), true, 32, '***'), '<p><a href="http://www.google.com/?q=symfony+link">http://www.google.com/?q=symfony***</a></p>', 'auto_link_text() takes truncation parameters');
+$t->is(auto_link_text('<p>http://www.google.com/?q=symfony+link</p>', 'all', [], true), '<p><a href="http://www.google.com/?q=symfony+link">http://www.google.com/?q=symfony+li...</a></p>', 'auto_link_text() truncates URLs in links');
+$t->is(auto_link_text('<p>http://www.google.com/?q=symfony+link</p>', 'all', [], true, 32, '***'), '<p><a href="http://www.google.com/?q=symfony+link">http://www.google.com/?q=symfony***</a></p>', 'auto_link_text() takes truncation parameters');
 $t->is(auto_link_text('<p>http://twitter.com/#!/fabpot</p>'), '<p><a href="http://twitter.com/#!/fabpot">http://twitter.com/#!/fabpot</a></p>', 'auto_link_text() converts URLs with complex fragments to links');
 $t->is(auto_link_text('<p>http://twitter.com/#!/fabpot is Fabien Potencier on Twitter</p>'), '<p><a href="http://twitter.com/#!/fabpot">http://twitter.com/#!/fabpot</a> is Fabien Potencier on Twitter</p>', 'auto_link_text() converts URLs with complex fragments and trailing text to links');
 $t->is(auto_link_text('hello '.$email_result, 'email_addresses'), 'hello '.$email_result, 'auto_link_text() does not double-link emails');
diff --git a/test/unit/helper/UrlHelperTest.php b/test/unit/helper/UrlHelperTest.php
index e4a746055..ea58a405f 100644
--- a/test/unit/helper/UrlHelperTest.php
+++ b/test/unit/helper/UrlHelperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +15,7 @@
 
 class myController
 {
-    public function genUrl($parameters = array(), $absolute = false)
+    public function genUrl($parameters = [], $absolute = false)
     {
         $url = is_array($parameters) && isset($parameters['sf_route']) ? $parameters['sf_route'] : 'module/action';
 
@@ -40,7 +41,7 @@ public function getHost()
     }
 }
 
-class BaseForm extends sfForm
+class BaseForm extends \sfForm
 {
     public function getCSRFToken($secret = null)
     {
@@ -48,11 +49,11 @@ public function getCSRFToken($secret = null)
     }
 }
 
-sfForm::enableCSRFProtection();
+\sfForm::enableCSRFProtection();
 
-$t = new lime_test(44);
+$t = new \lime_test(44);
 
-$context = sfContext::getInstance(array('controller' => 'myController', 'request' => 'myRequest'));
+$context = \sfContext::getInstance(['controller' => 'myController', 'request' => 'myRequest']);
 
 require_once __DIR__.'/../../../lib/helper/AssetHelper.php';
 
@@ -69,33 +70,33 @@ public function getCSRFToken($secret = null)
 // link_to()
 $t->diag('link_to()');
 $t->is(link_to('test', '@homepage'), '<a href="module/action">test</a>', 'link_to() returns an HTML "a" tag');
-$t->is(link_to('test', '@homepage', array('absolute' => true)), '<a href="/module/action">test</a>', 'link_to() can take an "absolute" option');
-$t->is(link_to('test', '@homepage', array('absolute' => false)), '<a href="module/action">test</a>', 'link_to() can take an "absolute" option');
-$t->is(link_to('test', '@homepage', array('query_string' => 'foo=bar')), '<a href="module/action?foo=bar">test</a>', 'link_to() can take a "query_string" option');
-$t->is(link_to('test', '@homepage', array('anchor' => 'bar')), '<a href="module/action#bar">test</a>', 'link_to() can take an "anchor" option');
+$t->is(link_to('test', '@homepage', ['absolute' => true]), '<a href="/module/action">test</a>', 'link_to() can take an "absolute" option');
+$t->is(link_to('test', '@homepage', ['absolute' => false]), '<a href="module/action">test</a>', 'link_to() can take an "absolute" option');
+$t->is(link_to('test', '@homepage', ['query_string' => 'foo=bar']), '<a href="module/action?foo=bar">test</a>', 'link_to() can take a "query_string" option');
+$t->is(link_to('test', '@homepage', ['anchor' => 'bar']), '<a href="module/action#bar">test</a>', 'link_to() can take an "anchor" option');
 $t->is(link_to('', '@homepage'), '<a href="module/action">module/action</a>', 'link_to() takes the url as the link name if the first argument is empty');
-$t->like(link_to('test', '@homepage', array('method' => 'post')), '/==TOKEN==/', 'link_to() includes CSRF token from BaseForm');
+$t->like(link_to('test', '@homepage', ['method' => 'post']), '/==TOKEN==/', 'link_to() includes CSRF token from BaseForm');
 
 // button_to()
 $t->diag('button_to()');
 $t->is(button_to('test', '@homepage'), '<input value="test" type="button" onclick="document.location.href=\'module/action\';" />', 'button_to() returns an HTML "input" tag');
-$t->is(button_to('test', '@homepage', array('query_string' => 'foo=bar')), '<input value="test" type="button" onclick="document.location.href=\'module/action?foo=bar\';" />', 'button_to() returns an HTML "input" tag');
-$t->is(button_to('test', '@homepage', array('anchor' => 'bar')), '<input value="test" type="button" onclick="document.location.href=\'module/action#bar\';" />', 'button_to() returns an HTML "input" tag');
-$t->is(button_to('test', '@homepage', array('popup' => 'true', 'query_string' => 'foo=bar')), '<input value="test" type="button" onclick="var w=window.open(\'module/action?foo=bar\');w.focus();return false;" />', 'button_to() returns an HTML "input" tag');
+$t->is(button_to('test', '@homepage', ['query_string' => 'foo=bar']), '<input value="test" type="button" onclick="document.location.href=\'module/action?foo=bar\';" />', 'button_to() returns an HTML "input" tag');
+$t->is(button_to('test', '@homepage', ['anchor' => 'bar']), '<input value="test" type="button" onclick="document.location.href=\'module/action#bar\';" />', 'button_to() returns an HTML "input" tag');
+$t->is(button_to('test', '@homepage', ['popup' => 'true', 'query_string' => 'foo=bar']), '<input value="test" type="button" onclick="var w=window.open(\'module/action?foo=bar\');w.focus();return false;" />', 'button_to() returns an HTML "input" tag');
 $t->is(button_to('test', '@homepage', 'popup=true'), '<input value="test" type="button" onclick="var w=window.open(\'module/action\');w.focus();return false;" />', 'button_to() accepts options as string');
 $t->is(button_to('test', '@homepage', 'confirm=really?'), '<input value="test" type="button" onclick="if (confirm(\'really?\')) { return document.location.href=\'module/action\';} else return false;" />', 'button_to() works with confirm option');
 $t->is(button_to('test', '@homepage', 'popup=true confirm=really?'), '<input value="test" type="button" onclick="if (confirm(\'really?\')) { var w=window.open(\'module/action\');w.focus(); };return false;" />', 'button_to() works with confirm and popup option');
-$t->like(button_to('test', '@homepage', array('method' => 'post')), '/==TOKEN==/', 'button_to() includes CSRF token from BaseForm');
+$t->like(button_to('test', '@homepage', ['method' => 'post']), '/==TOKEN==/', 'button_to() includes CSRF token from BaseForm');
 
 class testObject
 {
 }
 
 try {
-    $o1 = new testObject();
+    $o1 = new \testObject();
     link_to($o1, '@homepage');
     $t->fail('link_to() can take an object as its first argument if __toString() method is defined');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('link_to() can take an object as its first argument if __toString() method is defined');
 }
 
@@ -106,26 +107,26 @@ public function __toString()
         return 'test';
     }
 }
-$o2 = new testObjectWithToString();
+$o2 = new \testObjectWithToString();
 $t->is(link_to($o2, '@homepage'), '<a href="module/action">test</a>', 'link_to() can take an object as its first argument');
 
 // link_to_if()
 $t->diag('link_to_if()');
 $t->is(link_to_if(true, 'test', '@homepage'), '<a href="module/action">test</a>', 'link_to_if() returns an HTML "a" tag if the condition is true');
 $t->is(link_to_if(false, 'test', '@homepage'), '<span>test</span>', 'link_to_if() returns an HTML "span" tag by default if the condition is false');
-$t->is(link_to_if(false, 'test', '@homepage', array('tag' => 'div')), '<div>test</div>', 'link_to_if() takes a "tag" option');
+$t->is(link_to_if(false, 'test', '@homepage', ['tag' => 'div']), '<div>test</div>', 'link_to_if() takes a "tag" option');
 $t->is(link_to_if(true, 'test', '@homepage', 'tag=div'), '<a href="module/action">test</a>', 'link_to_if() removes "tag" option (given as string) in true case');
-$t->is(link_to_if(true, 'test', '@homepage', array('tag' => 'div')), '<a href="module/action">test</a>', 'link_to_if() removes "tag" option (given as array) in true case');
-$t->is(link_to_if(false, 'test', '@homepage', array('query_string' => 'foo=bar', 'absolute' => true, 'absolute_url' => 'http://www.google.com/')), '<span>test</span>', 'link_to_if() returns an HTML "span" tag by default if the condition is false');
-$t->is(link_to_if(true, 'test', 'homepage', array(), array('class' => 'test')), '<a class="test" href="homepage">test</a>', 'link_to_if() accepts link_to2 compatible usage');
-$t->is(link_to_if(false, 'test', 'homepage', array(), array('class' => 'test')), '<span class="test">test</span>', 'link_to_if() accepts link_to2 compatible usage');
+$t->is(link_to_if(true, 'test', '@homepage', ['tag' => 'div']), '<a href="module/action">test</a>', 'link_to_if() removes "tag" option (given as array) in true case');
+$t->is(link_to_if(false, 'test', '@homepage', ['query_string' => 'foo=bar', 'absolute' => true, 'absolute_url' => 'http://www.google.com/']), '<span>test</span>', 'link_to_if() returns an HTML "span" tag by default if the condition is false');
+$t->is(link_to_if(true, 'test', 'homepage', [], ['class' => 'test']), '<a class="test" href="homepage">test</a>', 'link_to_if() accepts link_to2 compatible usage');
+$t->is(link_to_if(false, 'test', 'homepage', [], ['class' => 'test']), '<span class="test">test</span>', 'link_to_if() accepts link_to2 compatible usage');
 
 // link_to_unless()
 $t->diag('link_to_unless()');
 $t->is(link_to_unless(false, 'test', '@homepage'), '<a href="module/action">test</a>', 'link_to_unless() returns an HTML "a" tag if the condition is false');
 $t->is(link_to_unless(true, 'test', '@homepage'), '<span>test</span>', 'link_to_unless() returns an HTML "span" tag by default if the condition is true');
-$t->is(link_to_unless(true, 'test', 'homepage', array(), array('class' => 'test')), '<span class="test">test</span>', 'link_to_unless() accepts link_to2 compatible usage');
-$t->is(link_to_unless(false, 'test', 'homepage', array(), array('class' => 'test')), '<a class="test" href="homepage">test</a>', 'link_to_unless() accepts link_to2 compatible usage');
+$t->is(link_to_unless(true, 'test', 'homepage', [], ['class' => 'test']), '<span class="test">test</span>', 'link_to_unless() accepts link_to2 compatible usage');
+$t->is(link_to_unless(false, 'test', 'homepage', [], ['class' => 'test']), '<a class="test" href="homepage">test</a>', 'link_to_unless() accepts link_to2 compatible usage');
 
 // public_path()
 $t->diag('public_path()');
@@ -137,14 +138,14 @@ public function __toString()
 $t->diag('mail_to()');
 $t->is(mail_to('fabien.potencier@symfony-project.com'), '<a href="mailto:fabien.potencier@symfony-project.com">fabien.potencier@symfony-project.com</a>', 'mail_to() creates a mailto a tag');
 $t->is(mail_to('fabien.potencier@symfony-project.com', 'fabien'), '<a href="mailto:fabien.potencier@symfony-project.com">fabien</a>', 'mail_to() creates a mailto a tag');
-preg_match('/href="(.+?)"/', mail_to('fabien.potencier@symfony-project.com', 'fabien', array('encode' => true)), $matches);
+preg_match('/href="(.+?)"/', mail_to('fabien.potencier@symfony-project.com', 'fabien', ['encode' => true]), $matches);
 $t->is(html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8'), 'mailto:fabien.potencier@symfony-project.com', 'mail_to() can encode the email address');
 
 $t->diag('mail_to test');
 $t->is(mail_to('webmaster@example.com'), '<a href="mailto:webmaster@example.com">webmaster@example.com</a>', 'mail_to with only given email works');
 $t->is(mail_to('webmaster@example.com', 'send us an email'), '<a href="mailto:webmaster@example.com">send us an email</a>', 'mail_to with given email and title works');
-$t->isnt(mail_to('webmaster@example.com', 'encoded', array('encode' => true)), '<a href="mailto:webmaster@example.com">encoded</a>', 'mail_to with encoding works');
+$t->isnt(mail_to('webmaster@example.com', 'encoded', ['encode' => true]), '<a href="mailto:webmaster@example.com">encoded</a>', 'mail_to with encoding works');
 
-$t->is(mail_to('webmaster@example.com', '', array(), array('subject' => 'test subject', 'body' => 'test body')), '<a href="mailto:webmaster@example.com?subject=test+subject&amp;body=test+body">webmaster@example.com</a>', 'mail_to() works with given default values in array form');
-$t->is(mail_to('webmaster@example.com', '', array(), 'subject=test subject body=test body'), '<a href="mailto:webmaster@example.com?subject=test+subject&amp;body=test+body">webmaster@example.com</a>', 'mail_to() works with given default values in string form');
-$t->is(mail_to('webmaster@example.com', '', array(), 'subject=Hello World and more'), '<a href="mailto:webmaster@example.com?subject=Hello+World+and+more">webmaster@example.com</a>', 'mail_to() works with given default value with spaces');
+$t->is(mail_to('webmaster@example.com', '', [], ['subject' => 'test subject', 'body' => 'test body']), '<a href="mailto:webmaster@example.com?subject=test+subject&amp;body=test+body">webmaster@example.com</a>', 'mail_to() works with given default values in array form');
+$t->is(mail_to('webmaster@example.com', '', [], 'subject=test subject body=test body'), '<a href="mailto:webmaster@example.com?subject=test+subject&amp;body=test+body">webmaster@example.com</a>', 'mail_to() works with given default values in string form');
+$t->is(mail_to('webmaster@example.com', '', [], 'subject=Hello World and more'), '<a href="mailto:webmaster@example.com?subject=Hello+World+and+more">webmaster@example.com</a>', 'mail_to() works with given default value with spaces');
diff --git a/test/unit/i18n/dataTest.php b/test/unit/i18n/dataTest.php
index d0c18a917..479773014 100644
--- a/test/unit/i18n/dataTest.php
+++ b/test/unit/i18n/dataTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(92);
+$t = new \lime_test(92);
 
 $t->diag('i18n data');
 $en = unserialize(file_get_contents(__DIR__.'/../../../lib/i18n/data/en.dat'));
 
 // check main keys
-foreach (array('Countries', 'Currencies', 'Languages', 'LocaleScript', 'NumberPatterns', 'Scripts', 'Types', 'Variants', 'Version', 'calendar', 'zoneStrings') as $entry) {
+foreach (['Countries', 'Currencies', 'Languages', 'LocaleScript', 'NumberPatterns', 'Scripts', 'Types', 'Variants', 'Version', 'calendar', 'zoneStrings'] as $entry) {
     $t->ok(isset($en[$entry]), sprintf('i18n data files may contain a "%s" entry', $entry));
 }
 
@@ -27,8 +28,8 @@
 
 // Currencies
 $t->diag('Currencies');
-$t->is($en['Currencies']['EUR'], array('€', 'Euro'), '"Currencies" contains currency names and symbols');
-$t->is($en['Currencies']['USD'], array('$', 'US Dollar'), '"Currencies" contains currency names and symbols');
+$t->is($en['Currencies']['EUR'], ['€', 'Euro'], '"Currencies" contains currency names and symbols');
+$t->is($en['Currencies']['USD'], ['$', 'US Dollar'], '"Currencies" contains currency names and symbols');
 
 // Languages
 $t->diag('Languages');
@@ -59,39 +60,39 @@
 
 $t->diag('calendar/dayNames');
 $a = $c['dayNames']['format']['abbreviated'];
-foreach (array(0 => 'Sun', 1 => 'Mon', 2 => 'Tue', 3 => 'Wed', 4 => 'Thu', 5 => 'Fri', 6 => 'Sat') as $key => $name) {
+foreach ([0 => 'Sun', 1 => 'Mon', 2 => 'Tue', 3 => 'Wed', 4 => 'Thu', 5 => 'Fri', 6 => 'Sat'] as $key => $name) {
     $t->is($a[$key], $name, '"calendar" contains abrreviated day names');
 }
 $a = $c['dayNames']['stand-alone']['narrow'];
-foreach (array(0 => 'S', 1 => 'M', 2 => 'T', 3 => 'W', 4 => 'T', 5 => 'F', 6 => 'S') as $key => $name) {
+foreach ([0 => 'S', 1 => 'M', 2 => 'T', 3 => 'W', 4 => 'T', 5 => 'F', 6 => 'S'] as $key => $name) {
     $t->is($a[$key], $name, '"calendar" contains narrow day names');
 }
 $a = $c['dayNames']['format']['wide'];
-foreach (array(0 => 'Sunday', 1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday') as $key => $name) {
+foreach ([0 => 'Sunday', 1 => 'Monday', 2 => 'Tuesday', 3 => 'Wednesday', 4 => 'Thursday', 5 => 'Friday', 6 => 'Saturday'] as $key => $name) {
     $t->is($a[$key], $name, '"calendar" contains day names');
 }
 
 $t->diag('calendar/eras');
-$t->is($c['eras']['abbreviated'], array(0 => 'BC', 1 => 'AD'), '"calendar" contains era names');
+$t->is($c['eras']['abbreviated'], [0 => 'BC', 1 => 'AD'], '"calendar" contains era names');
 
 $t->diag('calendar/monthNames');
 $a = $c['monthNames']['format']['abbreviated'];
-foreach (array(0 => 'Jan', 1 => 'Feb', 2 => 'Mar', 3 => 'Apr', 4 => 'May', 5 => 'Jun', 6 => 'Jul', 7 => 'Aug', 8 => 'Sep', 9 => 'Oct', 10 => 'Nov', 11 => 'Dec') as $key => $name) {
+foreach ([0 => 'Jan', 1 => 'Feb', 2 => 'Mar', 3 => 'Apr', 4 => 'May', 5 => 'Jun', 6 => 'Jul', 7 => 'Aug', 8 => 'Sep', 9 => 'Oct', 10 => 'Nov', 11 => 'Dec'] as $key => $name) {
     $t->is($a[$key], $name, '"calendar" contains abrreviated month names');
 }
 $a = $c['monthNames']['stand-alone']['narrow'];
-foreach (array(0 => 'J', 1 => 'F', 2 => 'M', 3 => 'A', 4 => 'M', 5 => 'J', 6 => 'J', 7 => 'A', 8 => 'S', 9 => 'O', 10 => 'N', 11 => 'D') as $key => $name) {
+foreach ([0 => 'J', 1 => 'F', 2 => 'M', 3 => 'A', 4 => 'M', 5 => 'J', 6 => 'J', 7 => 'A', 8 => 'S', 9 => 'O', 10 => 'N', 11 => 'D'] as $key => $name) {
     $t->is($a[$key], $name, '"calendar" contains narrow month names');
 }
 $a = $c['monthNames']['format']['wide'];
-foreach (array(0 => 'January', 1 => 'February', 2 => 'March', 3 => 'April', 4 => 'May', 5 => 'June', 6 => 'July', 7 => 'August', 8 => 'September', 9 => 'October', 10 => 'November', 11 => 'December') as $key => $name) {
+foreach ([0 => 'January', 1 => 'February', 2 => 'March', 3 => 'April', 4 => 'May', 5 => 'June', 6 => 'July', 7 => 'August', 8 => 'September', 9 => 'October', 10 => 'November', 11 => 'December'] as $key => $name) {
     $t->is($a[$key], $name, '"calendar" contains month names');
 }
 
 // zoneStrings
 $t->diag('zoneStrings');
 $a = $en['zoneStrings']['meta:Alaska'];
-foreach (array('ld' => 'Alaska Daylight Time', 'lg' => 'Alaska Time', 'ls' => 'Alaska Standard Time', 'sg' => 'AKT') as $key => $name) {
+foreach (['ld' => 'Alaska Daylight Time', 'lg' => 'Alaska Time', 'ls' => 'Alaska Standard Time', 'sg' => 'AKT'] as $key => $name) {
     $t->is($a[$key], $name, '"zoneStrings" contains time zone names');
 }
 
diff --git a/test/unit/i18n/extract/sfI18nExtractTest.php b/test/unit/i18n/extract/sfI18nExtractTest.php
index ba519c3b9..d61adefe4 100644
--- a/test/unit/i18n/extract/sfI18nExtractTest.php
+++ b/test/unit/i18n/extract/sfI18nExtractTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,30 +11,30 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
 }
 
-class TestConfiguration extends sfApplicationConfiguration
+class TestConfiguration extends \sfApplicationConfiguration
 {
     public function getI18NGlobalDirs()
     {
-        return array(__DIR__.'/../fixtures');
+        return [__DIR__.'/../fixtures'];
     }
 }
 
-$configuration = new TestConfiguration('test', true, sfConfig::get('sf_test_cache_dir', sys_get_temp_dir()));
-$cache = new sfNoCache();
-$i18n = new sfI18N($configuration, $cache);
+$configuration = new \TestConfiguration('test', true, \sfConfig::get('sf_test_cache_dir', sys_get_temp_dir()));
+$cache = new \sfNoCache();
+$i18n = new \sfI18N($configuration, $cache);
 
 /**
  * @internal
  *
  * @coversNothing
  */
-class sfI18nExtractTest extends sfI18nExtract
+class sfI18nExtractTest extends \sfI18nExtract
 {
     public function extract()
     {
@@ -42,13 +43,13 @@ public function extract()
 
     public function getMessages()
     {
-        return array('toto', 'an english sentence');
+        return ['toto', 'an english sentence'];
     }
 }
 
 // ->initialize()
 $t->diag('->initialize()');
-$extract = new sfI18nExtractTest($i18n, 'fr');
+$extract = new \sfI18nExtractTest($i18n, 'fr');
 $t->is(count($extract->getCurrentMessages()), 4, '->initialize() initializes the current i18n messages');
 $extract->extract();
 
diff --git a/test/unit/i18n/extract/sfI18nPhpExtractorTest.php b/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
index 9d70099cc..80ef1cb06 100644
--- a/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
+++ b/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
 // __construct()
 $t->diag('__construct()');
-$e = new sfI18nPhpExtractor();
-$t->ok($e instanceof sfI18nExtractorInterface, 'sfI18nPhpExtractor implements the sfI18nExtractorInterface interface');
+$e = new \sfI18nPhpExtractor();
+$t->ok($e instanceof \sfI18nExtractorInterface, 'sfI18nPhpExtractor implements the sfI18nExtractorInterface interface');
 
 // ->extract();
 $t->diag('->extract()');
@@ -30,19 +31,19 @@
 <?php __("I\'m so \"happy\"") ?>
 EOF;
 
-$t->is($e->extract($content), array('foo', 'I\'m "happy"', 'I\'m very "happy"', 'I\\\'m so "happy"'), '->extract() extracts strings from PHP files');
+$t->is($e->extract($content), ['foo', 'I\'m "happy"', 'I\'m very "happy"', 'I\\\'m so "happy"'], '->extract() extracts strings from PHP files');
 
 $content = <<<'EOF'
 <?php format_number_choice('foo') ?>
 EOF;
 
-$t->is($e->extract($content), array('foo'), '->extract() takes into account the format_number_choice() helper');
+$t->is($e->extract($content), ['foo'], '->extract() takes into account the format_number_choice() helper');
 
 $content = <<<'EOF'
 <?php $this->getContext()->getI18N()->__('foo') ?>
 EOF;
 
-$t->is($e->extract($content), array('foo'), '->extract() takes into account calls in an action file');
+$t->is($e->extract($content), ['foo'], '->extract() takes into account calls in an action file');
 
 $content = <<<'EOF'
 <?php
@@ -53,7 +54,7 @@
 ?>
 EOF;
 
-$t->is($e->extract($content), array('foo', 'bar', 'foobar', 'foo %a% bar'), '->extract() extracts strings from \'\' and "" quoted strings');
+$t->is($e->extract($content), ['foo', 'bar', 'foobar', 'foo %a% bar'], '->extract() extracts strings from \'\' and "" quoted strings');
 
 $content = <<<'EOF'
 <?php
@@ -65,7 +66,7 @@
 ?>
 EOF;
 
-$t->is($e->extract($content), array('foo', 'bar'), '->extract() does not care if you add some whitespaces');
+$t->is($e->extract($content), ['foo', 'bar'], '->extract() does not care if you add some whitespaces');
 
 $content = <<<'EOF'
 <?php
@@ -80,4 +81,4 @@
 );
 EOF;
 
-$t->is(fix_linebreaks($e->extract($content)), array("foo\n", "bar\n"), '->extract() extracts strings from HEREDOC quoted strings');
+$t->is(fix_linebreaks($e->extract($content)), ["foo\n", "bar\n"], '->extract() extracts strings from HEREDOC quoted strings');
diff --git a/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php b/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
index 701c1fb08..b76a37d02 100644
--- a/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
+++ b/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
 // __construct()
 $t->diag('__construct()');
-$e = new sfI18nYamlGeneratorExtractor();
-$t->ok($e instanceof sfI18nExtractorInterface, 'sfI18nYamlGeneratorExtractor implements the sfI18nExtractorInterface interface');
+$e = new \sfI18nYamlGeneratorExtractor();
+$t->ok($e instanceof \sfI18nExtractorInterface, 'sfI18nYamlGeneratorExtractor implements the sfI18nExtractorInterface interface');
 
 // ->extract();
 $t->diag('->extract()');
@@ -40,7 +41,7 @@
           name: { name: "Edit Field Name", help: "Edit Help for Name" }
 EOF;
 
-$t->is($e->extract($content), array(
+$t->is($e->extract($content), [
     'List title',
     'Edit title',
     'Global Field Name',
@@ -51,7 +52,7 @@
     'Edit Help for Name',
     'First category',
     'Last category',
-), '->extract() extracts strings from generator.yml files');
+], '->extract() extracts strings from generator.yml files');
 
 $content = <<<'EOF'
 generator:
@@ -60,4 +61,4 @@
       display: [first_name, last_name]
 EOF;
 
-$t->is($e->extract($content), array(), '->extract() extracts strings from generator.yml files');
+$t->is($e->extract($content), [], '->extract() extracts strings from generator.yml files');
diff --git a/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php b/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
index f8189bbbc..31cff8e82 100644
--- a/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
+++ b/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
 // __construct()
 $t->diag('__construct()');
-$e = new sfI18nYamlValidateExtractor();
-$t->ok($e instanceof sfI18nExtractorInterface, 'sfI18nYamlValidateExtractor implements the sfI18nExtractorInterface interface');
+$e = new \sfI18nYamlValidateExtractor();
+$t->ok($e instanceof \sfI18nExtractorInterface, 'sfI18nYamlValidateExtractor implements the sfI18nExtractorInterface interface');
 
 // ->extract();
 $t->diag('->extract()');
@@ -36,9 +37,9 @@ class: sfStringValidator
       max_error: The name is really too long
 EOF;
 
-$t->is($e->extract($content), array(
+$t->is($e->extract($content), [
     'Name is required',
     'The name is too short',
     'The name is really too short',
     'The name is really too long',
-), '->extract() extracts strings from generator.yml files');
+], '->extract() extracts strings from generator.yml files');
diff --git a/test/unit/i18n/sfChoiceFormatTest.php b/test/unit/i18n/sfChoiceFormatTest.php
index a5e6356bf..b665bac7d 100644
--- a/test/unit/i18n/sfChoiceFormatTest.php
+++ b/test/unit/i18n/sfChoiceFormatTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,51 +11,51 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(90);
+$t = new \lime_test(90);
 
-$n = new sfChoiceFormat();
+$n = new \sfChoiceFormat();
 
-$strings = array(
-    array(
+$strings = [
+    [
         '[1,2] accepts values between 1 and 2, inclusive',
-        array(
-            array('[1,2]'),
-            array('accepts values between 1 and 2, inclusive'),
-        ),
-    ),
+        [
+            ['[1,2]'],
+            ['accepts values between 1 and 2, inclusive'],
+        ],
+    ],
 
-    array(
+    [
         '(1,2) accepts values between 1 and 2, excluding 1 and 2',
-        array(
-            array('(1,2)'),
-            array('accepts values between 1 and 2, excluding 1 and 2'),
-        ),
-    ),
+        [
+            ['(1,2)'],
+            ['accepts values between 1 and 2, excluding 1 and 2'],
+        ],
+    ],
 
-    array(
+    [
         '{1,2,3,4} only values defined in the set are accepted',
-        array(
-            array('{1,2,3,4}'),
-            array('only values defined in the set are accepted'),
-        ),
-    ),
+        [
+            ['{1,2,3,4}'],
+            ['only values defined in the set are accepted'],
+        ],
+    ],
 
-    array(
+    [
         '[-Inf,0) accepts value greater or equal to negative infinity and strictly less than 0',
-        array(
-            array('[-Inf,0)'),
-            array('accepts value greater or equal to negative infinity and strictly less than 0'),
-        ),
-    ),
+        [
+            ['[-Inf,0)'],
+            ['accepts value greater or equal to negative infinity and strictly less than 0'],
+        ],
+    ],
 
-    array(
+    [
         '[0] no file|[1] one file|(1,Inf] {number} files',
-        array(
-            array('[0]', '[1]', '(1,Inf]'),
-            array('no file', 'one file', '{number} files'),
-        ),
-    ),
-);
+        [
+            ['[0]', '[1]', '(1,Inf]'],
+            ['no file', 'one file', '{number} files'],
+        ],
+    ],
+];
 
 // ->parse()
 $t->diag('->parse()');
@@ -81,7 +82,7 @@
 try {
     $n->isValid(1, '[1');
     $t->fail('->isValid() throw an exception if the set is not valid');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->isValid() throw an exception if the set is not valid');
 }
 
@@ -108,11 +109,11 @@
 
 $t->diag('set notation for polish');
 $string = '[1] plik |{2,3,4} pliki |[5,21] pliko\'w |{n: n % 10 > 1 && n %10 < 5} pliki |{n: n%10 >= 5 || n%10 <=1} pliko\'w';
-$wants = array(
-    'plik' => array(1),
-    'pliki' => array(2, 3, 4, 22, 23, 24),
-    'pliko\'w' => array(5, 6, 7, 11, 12, 15, 17, 20, 21, 25, 26, 30),
-);
+$wants = [
+    'plik' => [1],
+    'pliki' => [2, 3, 4, 22, 23, 24],
+    'pliko\'w' => [5, 6, 7, 11, 12, 15, 17, 20, 21, 25, 26, 30],
+];
 foreach ($wants as $want => $numbers) {
     foreach ($numbers as $number) {
         $t->is($n->format($string, $number), $want, '->format() can deal with polish!');
@@ -125,11 +126,11 @@
 |{n: n % 10 >= 2 && n % 10 <= 4 && ( n % 100 < 10 || n % 100 >= 20 )} test2
 |{n: 2} test3';
 
-$wants = array(
-    'test1' => array(1, 21, 31, 41),
-    'test2' => array(2, 4, 22, 24, 32, 34),
-    'test3' => array(0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 25, 26, 30),
-);
+$wants = [
+    'test1' => [1, 21, 31, 41],
+    'test2' => [2, 4, 22, 24, 32, 34],
+    'test3' => [0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 25, 26, 30],
+];
 foreach ($wants as $want => $numbers) {
     foreach ($numbers as $number) {
         $t->is($n->format($string, $number), $want, '->format() can deal with russian!');
@@ -139,13 +140,13 @@
 $t->diag('set notation for english');
 $string = '[0] none |{n: n % 10 == 1} 1st |{n: n % 10 == 2} 2nd |{n: n % 10 == 3} 3rd |{n:n} th';
 
-$wants = array(
-    'none' => array(0),
-    '1st' => array(1, 11, 21),
-    '2nd' => array(2, 12, 22),
-    '3rd' => array(3, 13, 23),
-    'th' => array(4, 5, 6, 7, 14, 15),
-);
+$wants = [
+    'none' => [0],
+    '1st' => [1, 11, 21],
+    '2nd' => [2, 12, 22],
+    '3rd' => [3, 13, 23],
+    'th' => [4, 5, 6, 7, 14, 15],
+];
 foreach ($wants as $want => $numbers) {
     foreach ($numbers as $number) {
         $t->is($n->format($string, $number), $want, '->format() can deal with english!');
diff --git a/test/unit/i18n/sfCultureInfoTest.php b/test/unit/i18n/sfCultureInfoTest.php
index 66f690631..0b80448e3 100644
--- a/test/unit/i18n/sfCultureInfoTest.php
+++ b/test/unit/i18n/sfCultureInfoTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,31 +11,31 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(67);
+$t = new \lime_test(67);
 
 // ->getInstance()
 $t->diag('->getInstance()');
-$c = sfCultureInfo::getInstance();
+$c = \sfCultureInfo::getInstance();
 $t->is($c->getName(), 'en', '->__construct() returns an object with "en" as the default culture');
-$c = sfCultureInfo::getInstance('fr');
+$c = \sfCultureInfo::getInstance('fr');
 $t->is($c->getName(), 'fr', '->__construct() takes a culture as its first argument');
-$c = sfCultureInfo::getInstance('');
+$c = \sfCultureInfo::getInstance('');
 $t->is($c->getName(), 'en', '->__construct() returns an object with "en" as the default culture');
 
 // __toString()
 $t->diag('__toString()');
-$c = sfCultureInfo::getInstance();
+$c = \sfCultureInfo::getInstance();
 $t->is($c->__toString(), 'en', '->__toString() returns the name of the culture');
 
 try {
-    $c = sfCultureInfo::getInstance('xxx');
+    $c = \sfCultureInfo::getInstance('xxx');
     $t->fail('->__construct() throws an exception if the culture is not valid');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->__construct() throws an exception if the culture is not valid');
 }
 
-$c_en = sfCultureInfo::getInstance();
-$c_fr = sfCultureInfo::getInstance('fr');
+$c_en = \sfCultureInfo::getInstance();
+$c_fr = \sfCultureInfo::getInstance('fr');
 
 // ->getLanguage()
 $t->diag('->getLanguage()');
@@ -46,7 +47,7 @@
 try {
     $c_en->getLanguage('gb');
     $t->fail('->getLanguage() throws an Exception if the given language is invalid.');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getLanguage() throws an Exception if the given language is invalid.');
 }
 
@@ -60,7 +61,7 @@
 try {
     $c_en->getCurrency('FRANCS');
     $t->fail('->getCurrency() throws an Exception if the given currency is invalid.');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getCurrency() throws an Exception if the given currency is invalid.');
 }
 
@@ -74,7 +75,7 @@
 try {
     $c_en->getCountry('en');
     $t->fail('->getCountry() throws an Exception if the given country is invalid.');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getCountry() throws an Exception if the given country is invalid.');
 }
 
@@ -86,13 +87,13 @@
 $t->is($languages_fr['fr'], 'français', '->getLanguages() returns a list of languages in the language of the localized version');
 $t->is($languages_en, $c_en->Languages, '->getLanguages() is equivalent to ->Languages');
 
-$languages = $c_en->getLanguages(array('fr', 'es'));
-$t->is(array_keys($languages), array('fr', 'es'), '->getLanguages() takes an array of languages as its first argument');
+$languages = $c_en->getLanguages(['fr', 'es']);
+$t->is(array_keys($languages), ['fr', 'es'], '->getLanguages() takes an array of languages as its first argument');
 
 try {
-    $c_en->getLanguages(array('fr', 'gb'));
+    $c_en->getLanguages(['fr', 'gb']);
     $t->fail('->getLanguages() throws an Exception if the list of given languages contains some invalid ones.');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getLanguages() throws an Exception if the list of given languages contains some invalid ones.');
 }
 
@@ -104,13 +105,13 @@
 $t->is($currencies_fr['EUR'], 'euro', '->getCurrencies() returns a list of currencies in the language of the localized version');
 $t->is($currencies_en, $c_en->Currencies, '->getCurrencies() is equivalent to ->Currencies');
 
-$currencies = $c_en->getCurrencies(array('USD', 'EUR'));
-$t->is(array_keys($currencies), array('EUR', 'USD'), '->getCurrencies() takes an array of currencies as its first argument');
+$currencies = $c_en->getCurrencies(['USD', 'EUR']);
+$t->is(array_keys($currencies), ['EUR', 'USD'], '->getCurrencies() takes an array of currencies as its first argument');
 
 try {
-    $c_en->getCurrencies(array('USD', 'FRANCS'));
+    $c_en->getCurrencies(['USD', 'FRANCS']);
     $t->fail('->getCurrencies() throws an Exception if the list of given currencies contains some invalid ones.');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getCurrencies() throws an Exception if the list of given currencies contains some invalid ones.');
 }
 
@@ -122,13 +123,13 @@
 $t->is($countries_fr['ES'], 'Espagne', '->getCountries() returns a list of countries in the language of the localized version');
 $t->is($countries_en, $c_en->Countries, '->getCountries() is equivalent to ->Countries');
 
-$countries = $c_en->getCountries(array('FR', 'ES'));
-$t->is(array_keys($countries), array('FR', 'ES'), '->getCountries() takes an array of countries as its first argument');
+$countries = $c_en->getCountries(['FR', 'ES']);
+$t->is(array_keys($countries), ['FR', 'ES'], '->getCountries() takes an array of countries as its first argument');
 
 try {
-    $c_en->getCountries(array('FR', 'EN'));
+    $c_en->getCountries(['FR', 'EN']);
     $t->fail('->getCountries() throws an Exception if the list of given countries contains some invalid ones.');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->getCountries() throws an Exception if the list of given countries contains some invalid ones.');
 }
 
@@ -153,58 +154,58 @@
 $t->diag('->validCulture()');
 $t->is($c->validCulture('fr'), true, '->validCulture() returns true if the culture is valid');
 $t->is($c->validCulture('fr_FR'), true, '->validCulture() returns true if the culture is valid');
-foreach (array('xxx', 'pp', 'frFR') as $culture) {
+foreach (['xxx', 'pp', 'frFR'] as $culture) {
     $t->is($c->validCulture($culture), false, '->validCulture() returns false if the culture does not exist');
 }
 
 // ::getCultures()
 $t->diag('::getCultures()');
-$cultures = sfCultureInfo::getCultures();
+$cultures = \sfCultureInfo::getCultures();
 $t->is(in_array('fr', $cultures), true, '::getCultures() returns an array of all available cultures');
 $t->is(in_array('fr_FR', $cultures), true, '::getCultures() returns an array of all available cultures');
 
-$cultures = sfCultureInfo::getCultures(sfCultureInfo::NEUTRAL);
+$cultures = \sfCultureInfo::getCultures(\sfCultureInfo::NEUTRAL);
 $t->is(in_array('fr', $cultures), true, '::getCultures() returns an array of all available cultures');
 $t->is(in_array('fr_FR', $cultures), false, '::getCultures() returns an array of all available cultures');
 
-$cultures = sfCultureInfo::getCultures(sfCultureInfo::SPECIFIC);
+$cultures = \sfCultureInfo::getCultures(\sfCultureInfo::SPECIFIC);
 $t->is(in_array('fr', $cultures), false, '::getCultures() returns an array of all available cultures');
 $t->is(in_array('fr_FR', $cultures), true, '::getCultures() returns an array of all available cultures');
 
 // ->getParent()
 $t->diag('->getParent()');
-$c = sfCultureInfo::getInstance('fr_FR');
+$c = \sfCultureInfo::getInstance('fr_FR');
 $t->isa_ok($c->getParent(), 'sfCultureInfo', '->getParent() returns a sfCultureInfo instance');
 $t->is($c->getParent()->getName(), 'fr', '->getParent() returns the parent culture');
-$c = sfCultureInfo::getInstance('fr');
+$c = \sfCultureInfo::getInstance('fr');
 $t->is($c->getParent()->getName(), 'en', '->getParent() returns the invariant culture if the culture is neutral');
 
 // ->getIsNeutralCulture()
 $t->diag('->getIsNeutralCulture()');
-$c = sfCultureInfo::getInstance('fr_FR');
+$c = \sfCultureInfo::getInstance('fr_FR');
 $t->is($c->getIsNeutralCulture(), false, '->getIsNeutralCulture() returns false if the culture is specific');
-$c = sfCultureInfo::getInstance('fr');
+$c = \sfCultureInfo::getInstance('fr');
 $t->is($c->getIsNeutralCulture(), true, '->getIsNeutralCulture() returns true if the culture is neutral');
 
 // ->getEnglishName()
 $t->diag('->getEnglishName()');
-$c = sfCultureInfo::getInstance('fr_FR');
+$c = \sfCultureInfo::getInstance('fr_FR');
 $t->is($c->getEnglishName(), 'French (France)', '->getEnglishName() returns the english name of the current culture');
-$c = sfCultureInfo::getInstance('fr');
+$c = \sfCultureInfo::getInstance('fr');
 $t->is($c->getEnglishName(), 'French', '->getEnglishName() returns the english name of the current culture');
 $t->is($c->getEnglishName(), $c->EnglishName, '->getEnglishName() is equivalent to ->EnglishName');
 
 // ->getNativeName()
 $t->diag('->getNativeName()');
-$c = sfCultureInfo::getInstance('fr_FR');
+$c = \sfCultureInfo::getInstance('fr_FR');
 $t->is($c->getNativeName(), 'français (France)', '->getNativeName() returns the native name of the current culture');
-$c = sfCultureInfo::getInstance('fr');
+$c = \sfCultureInfo::getInstance('fr');
 $t->is($c->getNativeName(), 'français', '->getNativeName() returns the native name of the current culture');
 $t->is($c->getNativeName(), $c->NativeName, '->getNativeName() is equivalent to ->NativeName');
 
 // ->getCalendar()
 $t->diag('->getCalendar()');
-$c = sfCultureInfo::getInstance('fr');
+$c = \sfCultureInfo::getInstance('fr');
 $t->is($c->getCalendar(), 'gregorian', '->getCalendar() returns the default calendar');
 $t->is($c->getCalendar(), $c->Calendar, '->getCalendar() is equivalent to ->Calendar');
 
@@ -214,7 +215,7 @@
 try {
     $c->NonExistant;
     $t->fail('__get() throws an exception if the property does not exist');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('__get() throws an exception if the property does not exist');
 }
 
@@ -224,13 +225,13 @@
 try {
     $c->NonExistant = 12;
     $t->fail('__set() throws an exception if the property does not exist');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('__set() throws an exception if the property does not exist');
 }
 
 // ->getDateTimeFormat()
 $t->diag('->getDateTimeFormat()');
-$c = sfCultureInfo::getInstance();
+$c = \sfCultureInfo::getInstance();
 $t->isa_ok($c->getDateTimeFormat(), 'sfDateTimeFormatInfo', '->getDateTimeFormat() returns a sfDateTimeFormatInfo instance');
 
 // ->setDateTimeFormat()
@@ -243,7 +244,7 @@
 
 // ->getNumberFormat()
 $t->diag('->getNumberFormat()');
-$c = sfCultureInfo::getInstance();
+$c = \sfCultureInfo::getInstance();
 $t->isa_ok($c->getNumberFormat(), 'sfNumberFormatInfo', '->getNumberFormat() returns a sfNumberFormatInfo instance');
 
 // ->setNumberFormat()
diff --git a/test/unit/i18n/sfI18NTest.php b/test/unit/i18n/sfI18NTest.php
index a1ea000bf..e0852681e 100644
--- a/test/unit/i18n/sfI18NTest.php
+++ b/test/unit/i18n/sfI18NTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,35 +11,35 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(34);
+$t = new \lime_test(34);
 
-class ProjectConfiguration extends sfProjectConfiguration
+class ProjectConfiguration extends \sfProjectConfiguration
 {
 }
 
-class TestConfiguration extends sfApplicationConfiguration
+class TestConfiguration extends \sfApplicationConfiguration
 {
     public function getI18NGlobalDirs()
     {
-        return array(__DIR__.'/fixtures');
+        return [__DIR__.'/fixtures'];
     }
 }
 
-$configuration = new TestConfiguration('test', true, sfConfig::get('sf_test_cache_dir', sys_get_temp_dir()));
+$configuration = new \TestConfiguration('test', true, \sfConfig::get('sf_test_cache_dir', sys_get_temp_dir()));
 $dispatcher = $configuration->getEventDispatcher();
-$cache = new sfNoCache();
+$cache = new \sfNoCache();
 
 // ->initialize()
 $t->diag('->initialize()');
-$i18n = new sfI18N($configuration, $cache);
-$dispatcher->notify(new sfEvent(null, 'user.change_culture', array('culture' => 'fr')));
+$i18n = new \sfI18N($configuration, $cache);
+$dispatcher->notify(new \sfEvent(null, 'user.change_culture', ['culture' => 'fr']));
 $t->is($i18n->getCulture(), 'fr', '->initialize() connects to the user.change_culture event');
 
 // passing a "culture" option to initialize() should set PHP locale
-if (version_compare(PHP_VERSION, '5.3', '<') && class_exists('Locale') && ($en = Locale::lookup(array('en-US'), 'en-US', true)) && ($fr = Locale::lookup(array('fr-FR'), 'fr-FR', true))) {
-    $i18n = new sfI18N($configuration, $cache, array('culture' => $fr));
+if (version_compare(PHP_VERSION, '5.3', '<') && class_exists('Locale') && ($en = \Locale::lookup(['en-US'], 'en-US', true)) && ($fr = \Locale::lookup(['fr-FR'], 'fr-FR', true))) {
+    $i18n = new \sfI18N($configuration, $cache, ['culture' => $fr]);
     $frLocale = localeconv();
-    $i18n = new sfI18N($configuration, $cache, array('culture' => $en));
+    $i18n = new \sfI18N($configuration, $cache, ['culture' => $en]);
     $enLocale = localeconv();
     $t->isnt(serialize($frLocale), serialize($enLocale), '->initialize() sets the PHP locale when a "culture" option is provided');
 } else {
@@ -47,15 +48,15 @@ public function getI18NGlobalDirs()
 
 // ->getCulture() ->setCulture()
 $t->diag('->getCulture() ->setCulture()');
-$i18n = new sfI18N($configuration, $cache);
+$i18n = new \sfI18N($configuration, $cache);
 $t->is($i18n->getCulture(), 'en', '->getCulture() returns the current culture');
 $i18n->setCulture('fr');
 $t->is($i18n->getCulture(), 'fr', '->setCulture() sets the current culture');
 
 // ->__()
 $t->diag('->__()');
-sfConfig::set('sf_charset', 'UTF-8');
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
+\sfConfig::set('sf_charset', 'UTF-8');
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'fr']);
 $t->is($i18n->__('an english sentence'), 'une phrase en français', '->__() translates a string');
 class EnglishSentence
 {
@@ -64,10 +65,10 @@ public function __toString()
         return 'an english sentence';
     }
 }
-$t->is($i18n->__(new EnglishSentence()), 'une phrase en français', '->__() translates an object with __toString()');
-$args = array('%timestamp%' => $timestamp = time());
+$t->is($i18n->__(new \EnglishSentence()), 'une phrase en français', '->__() translates an object with __toString()');
+$args = ['%timestamp%' => $timestamp = time()];
 $t->is($i18n->__('Current timestamp is %timestamp%', $args), strtr('Le timestamp courant est %timestamp%', $args), '->__() takes an array of arguments as its second argument');
-$t->is($i18n->__('an english sentence', array(), 'messages_bis'), 'une phrase en français (bis)', '->__() takes a catalogue as its third argument');
+$t->is($i18n->__('an english sentence', [], 'messages_bis'), 'une phrase en français (bis)', '->__() takes a catalogue as its third argument');
 
 // test for #2161
 $t->is($i18n->__('1 minute'), '1 menit', '->__() "1 minute" translated as "1 menit"');
@@ -78,25 +79,25 @@ public function __toString()
 $t->is($i18n->__('an english sentence'), 'une phrase en belge', '->__() translates a string');
 
 // debug
-$i18n = new sfI18N($configuration, $cache, array('debug' => true));
+$i18n = new \sfI18N($configuration, $cache, ['debug' => true]);
 $t->is($i18n->__('unknown'), '[T]unknown[/T]', '->__() adds a prefix and a suffix on untranslated strings if debug is on');
-$i18n = new sfI18N($configuration, $cache, array('debug' => true, 'untranslated_prefix' => '-', 'untranslated_suffix' => '#'));
+$i18n = new \sfI18N($configuration, $cache, ['debug' => true, 'untranslated_prefix' => '-', 'untranslated_suffix' => '#']);
 $t->is($i18n->__('unknown'), '-unknown#', '->initialize() can change the default prefix and suffix dor untranslated strings');
 
 // ->getCountry()
 $t->diag('->getCountry()');
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'fr']);
 $t->is($i18n->getCountry('FR'), 'France', '->getCountry() returns the name of a country for the current culture');
 $t->is($i18n->getCountry('FR', 'es'), 'Francia', '->getCountry() takes an optional culture as its second argument');
 
 // ->getNativeName()
 $t->diag('->getNativeName()');
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'fr']);
 $t->is($i18n->getNativeName('fr'), 'français', '->getNativeName() returns the name of a culture');
 
 // ->getTimestampForCulture()
 $t->diag('->getTimestampForCulture()');
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'fr']);
 $t->is($i18n->getTimestampForCulture('15/10/2005'), mktime(0, 0, 0, '10', '15', '2005'), '->getTimestampForCulture() returns the timestamp for a data formatted in the current culture');
 $t->is($i18n->getTimestampForCulture('15/10/2005 15:33'), mktime(15, 33, 0, '10', '15', '2005'), '->getTimestampForCulture() returns the timestamp for a data formatted in the current culture');
 $t->is($i18n->getTimestampForCulture('10/15/2005', 'en_US'), mktime(0, 0, 0, '10', '15', '2005'), '->getTimestampForCulture() can take a culture as its second argument');
@@ -105,26 +106,26 @@ public function __toString()
 
 // ->getDateForCulture()
 $t->diag('->getDateForCulture()');
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
-$t->is($i18n->getDateForCulture('15/10/2005'), array('15', '10', '2005'), '->getDateForCulture() returns the day, month and year for a data formatted in the current culture');
-$t->is($i18n->getDateForCulture('10/15/2005', 'en_US'), array('15', '10', '2005'), '->getDateForCulture() can take a culture as its second argument');
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'fr']);
+$t->is($i18n->getDateForCulture('15/10/2005'), ['15', '10', '2005'], '->getDateForCulture() returns the day, month and year for a data formatted in the current culture');
+$t->is($i18n->getDateForCulture('10/15/2005', 'en_US'), ['15', '10', '2005'], '->getDateForCulture() can take a culture as its second argument');
 $t->is($i18n->getDateForCulture(null), null, '->getDateForCulture() returns null in case of conversion problem');
 $t->is($i18n->getDateForCulture('not a date'), null, '->getDateForCulture() returns null in case of conversion problem');
 
 // german locale contains a dot as separator for date. See #7582
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'de'));
-$t->is($i18n->getDateForCulture('15.10.2005'), array('15', '10', '2005'), '->getDateForCulture() returns the day, month and year for a data formatted in culture with dots as separators');
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'de']);
+$t->is($i18n->getDateForCulture('15.10.2005'), ['15', '10', '2005'], '->getDateForCulture() returns the day, month and year for a data formatted in culture with dots as separators');
 $t->is($i18n->getDateForCulture('15x10x2005'), null, '->getDateForCulture() returns null in case of conversion problem with dots as separators');
 
 // ->getTimeForCulture()
 $t->diag('->getTimeForCulture()');
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'fr'));
-$t->is($i18n->getTimeForCulture('15:33'), array('15', '33'), '->getTimeForCulture() returns the hour and minuter for a time formatted in the current culture');
-$t->is($i18n->getTimeForCulture('3:33 pm', 'en_US'), array('15', '33'), '->getTimeForCulture() can take a culture as its second argument');
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'fr']);
+$t->is($i18n->getTimeForCulture('15:33'), ['15', '33'], '->getTimeForCulture() returns the hour and minuter for a time formatted in the current culture');
+$t->is($i18n->getTimeForCulture('3:33 pm', 'en_US'), ['15', '33'], '->getTimeForCulture() can take a culture as its second argument');
 $t->is($i18n->getTimeForCulture(null), null, '->getTimeForCulture() returns null in case of conversion problem');
 $t->is($i18n->getTimeForCulture('not a time'), null, '->getTimeForCulture() returns null in case of conversion problem');
 
 // swedish locale contains a dot as separator for time. See #7582
-$i18n = new sfI18N($configuration, $cache, array('culture' => 'sv'));
-$t->is($i18n->getTimeForCulture('15.33'), array('15', '33'), '->getTimeForCulture() returns the hour and minuter for a time formatted in culture with dots as separators');
+$i18n = new \sfI18N($configuration, $cache, ['culture' => 'sv']);
+$t->is($i18n->getTimeForCulture('15.33'), ['15', '33'], '->getTimeForCulture() returns the hour and minuter for a time formatted in culture with dots as separators');
 $t->is($i18n->getTimeForCulture('15x33'), null, '->getTimeForCulture() returns null in case of conversion problem with dots as separators');
diff --git a/test/unit/i18n/sfMessageSourceTest.php b/test/unit/i18n/sfMessageSourceTest.php
index 7e38efbbf..177c40294 100644
--- a/test/unit/i18n/sfMessageSourceTest.php
+++ b/test/unit/i18n/sfMessageSourceTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
-class sfMessageSource_Simple extends sfMessageSource
+class sfMessageSource_Simple extends \sfMessageSource
 {
     public function __construct($source)
     {
@@ -41,8 +42,8 @@ public function getId()
 
 // ::factory()
 $t->diag('::factory()');
-$source = sfMessageSource::factory('Simple');
-$t->ok($source instanceof sfIMessageSource, '::factory() returns a sfMessageSource instance');
+$source = \sfMessageSource::factory('Simple');
+$t->ok($source instanceof \sfIMessageSource, '::factory() returns a sfMessageSource instance');
 
 // ->getCulture() ->setCulture()
 $t->diag('->getCulture() ->setCulture()');
diff --git a/test/unit/i18n/sfMessageSource_AggregateTest.php b/test/unit/i18n/sfMessageSource_AggregateTest.php
index 1a36e5886..3740b3b29 100644
--- a/test/unit/i18n/sfMessageSource_AggregateTest.php
+++ b/test/unit/i18n/sfMessageSource_AggregateTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
 // setup
 $temp1 = tempnam('/tmp/i18ndir', 'tmp');
@@ -35,7 +36,7 @@
 $t->is($source->save(), true, '->save() returns true if some messages are saved');
 $source = get_source($temp1, $temp2);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'New message', '->save() saves new messages');
 
 // test new culture
@@ -45,7 +46,7 @@
 
 $source = get_source($temp1, $temp2);
 $source->setCulture('it');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message (it)'), 'New message (it)', '->save() saves new messages');
 
 $source->setCulture('fr_FR');
@@ -55,7 +56,7 @@
 $t->is($source->update('New message', 'Nouveau message', 'Comments'), true, '->update() returns true if the message has been updated');
 $source = get_source($temp1, $temp2);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'Nouveau message', '->update() updates a message translation');
 
 // ->delete()
@@ -64,19 +65,19 @@
 $t->is($source->delete('New message'), true, '->delete() returns true if the message has been deleted');
 $source = get_source($temp1, $temp2);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'New message', '->delete() deletes a message');
 
 // teardown
-sfToolkit::clearDirectory($temp1);
-sfToolkit::clearDirectory($temp2);
+\sfToolkit::clearDirectory($temp1);
+\sfToolkit::clearDirectory($temp2);
 rmdir($temp1);
 rmdir($temp2);
 
 function get_source($temp1, $temp2)
 {
-    $source1 = sfMessageSource::factory('XLIFF', $temp1);
-    $source2 = sfMessageSource::factory('XLIFF', $temp2);
+    $source1 = \sfMessageSource::factory('XLIFF', $temp1);
+    $source2 = \sfMessageSource::factory('XLIFF', $temp2);
 
-    return sfMessageSource::factory('Aggregate', array($source1, $source2));
+    return \sfMessageSource::factory('Aggregate', [$source1, $source2]);
 }
diff --git a/test/unit/i18n/sfMessageSource_FileTest.php b/test/unit/i18n/sfMessageSource_FileTest.php
index 1d963717d..4ce1e45db 100644
--- a/test/unit/i18n/sfMessageSource_FileTest.php
+++ b/test/unit/i18n/sfMessageSource_FileTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
-class sfMessageSource_Simple extends sfMessageSource_File
+class sfMessageSource_Simple extends \sfMessageSource_File
 {
     protected $dataExt = '.xml';
 
@@ -34,16 +35,16 @@ public function getCatalogueByDir($catalogue)
     }
 }
 
-$source = sfMessageSource::factory('Simple', __DIR__.'/fixtures');
+$source = \sfMessageSource::factory('Simple', __DIR__.'/fixtures');
 $source->setCulture('fr_FR');
 
 // ->getCatalogueByDir()
 $t->diag('->getCatalogueByDir()');
-$t->is($source->getCatalogueByDir('messages'), array('fr_FR/messages.xml', 'fr/messages.xml'), '->getCatalogueByDir() returns catalogues by directory');
+$t->is($source->getCatalogueByDir('messages'), ['fr_FR/messages.xml', 'fr/messages.xml'], '->getCatalogueByDir() returns catalogues by directory');
 
 // ->getCatalogueList()
 $t->diag('->getCatalogueList()');
-$t->is($source->getCatalogueList('messages'), array('fr_FR/messages.xml', 'fr/messages.xml', 'messages.fr_FR.xml', 'messages.fr.xml', 'messages.xml'), '->getCatalogueByDir() returns all catalogues for the current culture');
+$t->is($source->getCatalogueList('messages'), ['fr_FR/messages.xml', 'fr/messages.xml', 'messages.fr_FR.xml', 'messages.fr.xml', 'messages.xml'], '->getCatalogueByDir() returns all catalogues for the current culture');
 
 // ->getSource()
 $t->diag('->getSource()');
diff --git a/test/unit/i18n/sfMessageSource_SQLiteTest.php b/test/unit/i18n/sfMessageSource_SQLiteTest.php
index 1da839fe4..5079b31e9 100644
--- a/test/unit/i18n/sfMessageSource_SQLiteTest.php
+++ b/test/unit/i18n/sfMessageSource_SQLiteTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,7 +12,7 @@
 require_once __DIR__.'/../../bootstrap/unit.php';
 
 $plan = 10;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
     $t->skip('SQLite needed to run these tests', $plan);
@@ -47,9 +48,9 @@ function sf_test_shutdown()
 $t->is($source->save(), false, '->save() returns false if no message is saved');
 $source->append('New message');
 $t->is($source->save(), true, '->save() returns true if some messages are saved');
-$source = sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
+$source = \sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'New message', '->save() saves new messages');
 
 // test new culture
@@ -57,9 +58,9 @@ function sf_test_shutdown()
 $source->append('New message (it)');
 $source->save();
 
-$source = sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
+$source = \sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
 $source->setCulture('it');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message (it)'), 'New message (it)', '->save() saves new messages');
 
 $source->setCulture('fr_FR');
@@ -67,33 +68,33 @@ function sf_test_shutdown()
 // ->update()
 $t->diag('->update()');
 $t->is($source->update('New message', 'Nouveau message', 'Comments'), true, '->update() returns true if the message has been updated');
-$source = sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
+$source = \sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'Nouveau message', '->update() updates a message translation');
 
 // ->delete()
 $t->diag('->delete()');
 $t->is($source->delete('Non existant message'), false, '->delete() returns false if the message has not been deleted');
 $t->is($source->delete('New message'), true, '->delete() returns true if the message has been deleted');
-$source = sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
+$source = \sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'New message', '->delete() deletes a message');
 
 function init_fixtures($temp)
 {
-    $queries = array(
+    $queries = [
         'CREATE TABLE catalogue (cat_id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, source_lang VARCHAR, target_lang VARCHAR, date_created INT, date_modified INT, author VARCHAR);',
         'CREATE TABLE trans_unit (msg_id INTEGER PRIMARY KEY, cat_id INTEGER NOT NULL DEFAULT \'1\', id VARCHAR, source TEXT, target TEXT, comments TEXT, date_added INT, date_modified INT, author VARCHAR, translated INT(1) NOT NULL DEFAULT \'0\');',
         "INSERT INTO catalogue (cat_id, name) VALUES (1, 'messages.fr_FR')",
         "INSERT INTO catalogue (cat_id, name) VALUES (2, 'messages.it')",
         "INSERT INTO trans_unit (msg_id, cat_id, id, source, target, translated) VALUES (1, 1, 1, 'an english sentence', 'une phrase en français', 1)",
         "INSERT INTO trans_unit (msg_id, cat_id, id, source, target, translated) VALUES (2, 1, 2, 'another english sentence', 'une autre phrase en français', 1)",
-    );
+    ];
 
     if (version_compare(PHP_VERSION, '5.3', '>')) {
-        $db = new SQLite3($temp);
+        $db = new \SQLite3($temp);
 
         foreach ($queries as $query) {
             $db->exec($query);
@@ -110,5 +111,5 @@ function init_fixtures($temp)
         sqlite_close($db);
     }
 
-    return sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
+    return \sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
 }
diff --git a/test/unit/i18n/sfMessageSource_XLIFFTest.php b/test/unit/i18n/sfMessageSource_XLIFFTest.php
index 67b968c01..3c19f0160 100644
--- a/test/unit/i18n/sfMessageSource_XLIFFTest.php
+++ b/test/unit/i18n/sfMessageSource_XLIFFTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
 // setup
 $temp = tempnam('/tmp/i18ndir', 'tmp');
@@ -20,7 +21,7 @@
 // copy fixtures to tmp directory
 copy(__DIR__.'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml');
 
-$source = sfMessageSource::factory('XLIFF', $temp);
+$source = \sfMessageSource::factory('XLIFF', $temp);
 $source->setCulture('fr_FR');
 
 // ->loadData()
@@ -35,9 +36,9 @@
 $t->is($source->save(), false, '->save() returns false if no message is saved');
 $source->append('New message');
 $t->is($source->save(), true, '->save() returns true if some messages are saved');
-$source = sfMessageSource::factory('XLIFF', $temp);
+$source = \sfMessageSource::factory('XLIFF', $temp);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'New message', '->save() saves new messages');
 
 // test new culture
@@ -45,9 +46,9 @@
 $source->append('New message & <more> (it)');
 $source->save();
 
-$source = sfMessageSource::factory('XLIFF', $temp);
+$source = \sfMessageSource::factory('XLIFF', $temp);
 $source->setCulture('it');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message & <more> (it)'), 'New message & <more> (it)', '->save() saves new messages');
 
 $source->setCulture('fr_FR');
@@ -55,20 +56,20 @@
 // ->update()
 $t->diag('->update()');
 $t->is($source->update('New message', 'Nouveau message', ''), true, '->update() returns true if the message has been updated');
-$source = sfMessageSource::factory('XLIFF', $temp);
+$source = \sfMessageSource::factory('XLIFF', $temp);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'Nouveau message', '->update() updates a message translation');
 
 // ->delete()
 $t->diag('->delete()');
 $t->is($source->delete('Non existant message'), false, '->delete() returns false if the message has not been deleted');
 $t->is($source->delete('New message'), true, '->delete() returns true if the message has been deleted');
-$source = sfMessageSource::factory('XLIFF', $temp);
+$source = \sfMessageSource::factory('XLIFF', $temp);
 $source->setCulture('fr_FR');
-$format = new sfMessageFormat($source);
+$format = new \sfMessageFormat($source);
 $t->is($format->format('New message'), 'New message', '->delete() deletes a message');
 
 // teardown
-sfToolkit::clearDirectory($temp);
+\sfToolkit::clearDirectory($temp);
 rmdir($temp);
diff --git a/test/unit/i18n/sfNumberFormatInfoTest.php b/test/unit/i18n/sfNumberFormatInfoTest.php
index 8842acc0c..f57ab05af 100644
--- a/test/unit/i18n/sfNumberFormatInfoTest.php
+++ b/test/unit/i18n/sfNumberFormatInfoTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,59 +11,59 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(75);
+$t = new \lime_test(75);
 
 // __construct()
 $t->diag('__construct()');
 
 try {
-    $c = new sfNumberFormatInfo();
+    $c = new \sfNumberFormatInfo();
     $t->fail('__construct() takes a mandatory ICU array as its first argument');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('__construct() takes a mandatory ICU array as its first argument');
 }
 
 // ::getInstance()
 $t->diag('::getInstance()');
-$t->isa_ok(sfNumberFormatInfo::getInstance(), 'sfNumberFormatInfo', '::getInstance() returns an sfNumberFormatInfo instance');
-$c = sfCultureInfo::getInstance();
-$t->is(sfNumberFormatInfo::getInstance($c), $c->getNumberFormat(), '::getInstance() can take a sfCultureInfo instance as its first argument');
-$t->isa_ok(sfNumberFormatInfo::getInstance('fr'), 'sfNumberFormatInfo', '::getInstance() can take a culture as its first argument');
-$n = sfNumberFormatInfo::getInstance();
-$n->setPattern(sfNumberFormatInfo::PERCENTAGE);
-$t->is(sfNumberFormatInfo::getInstance(null, sfNumberFormatInfo::PERCENTAGE)->getPattern(), $n->getPattern(), '::getInstance() can take a formatting type as its second argument');
+$t->isa_ok(\sfNumberFormatInfo::getInstance(), 'sfNumberFormatInfo', '::getInstance() returns an sfNumberFormatInfo instance');
+$c = \sfCultureInfo::getInstance();
+$t->is(\sfNumberFormatInfo::getInstance($c), $c->getNumberFormat(), '::getInstance() can take a sfCultureInfo instance as its first argument');
+$t->isa_ok(\sfNumberFormatInfo::getInstance('fr'), 'sfNumberFormatInfo', '::getInstance() can take a culture as its first argument');
+$n = \sfNumberFormatInfo::getInstance();
+$n->setPattern(\sfNumberFormatInfo::PERCENTAGE);
+$t->is(\sfNumberFormatInfo::getInstance(null, \sfNumberFormatInfo::PERCENTAGE)->getPattern(), $n->getPattern(), '::getInstance() can take a formatting type as its second argument');
 
 // ->getPattern() ->setPattern()
 $t->diag('->getPattern() ->setPattern()');
-$n = sfNumberFormatInfo::getInstance();
-$n1 = sfNumberFormatInfo::getInstance();
-$n->setPattern(sfNumberFormatInfo::CURRENCY);
+$n = \sfNumberFormatInfo::getInstance();
+$n1 = \sfNumberFormatInfo::getInstance();
+$n->setPattern(\sfNumberFormatInfo::CURRENCY);
 $pattern = $n->getPattern();
-$n1->setPattern(sfNumberFormatInfo::PERCENTAGE);
+$n1->setPattern(\sfNumberFormatInfo::PERCENTAGE);
 $pattern1 = $n1->getPattern();
 $t->isnt($pattern, $pattern1, '->getPattern() ->setPattern() changes the current pattern');
 
-$n = sfNumberFormatInfo::getInstance();
-$n1 = sfNumberFormatInfo::getInstance();
-$n->Pattern = sfNumberFormatInfo::CURRENCY;
-$n1->setPattern(sfNumberFormatInfo::CURRENCY);
+$n = \sfNumberFormatInfo::getInstance();
+$n1 = \sfNumberFormatInfo::getInstance();
+$n->Pattern = \sfNumberFormatInfo::CURRENCY;
+$n1->setPattern(\sfNumberFormatInfo::CURRENCY);
 $t->is($n->getPattern(), $n1->getPattern(), '->setPattern() is equivalent to ->Pattern = ');
 $t->is($n->getPattern(), $n->Pattern, '->getPattern() is equivalent to ->Pattern');
 
 // ::getCurrencyInstance()
 $t->diag('::getCurrencyInstance()');
-$t->is(sfNumberFormatInfo::getCurrencyInstance()->getPattern(), sfNumberFormatInfo::getInstance(null, sfNumberFormatInfo::CURRENCY)->getPattern(), '::getCurrencyInstance() is a shortcut for ::getInstance() and type sfNumberFormatInfo::CURRENCY');
+$t->is(\sfNumberFormatInfo::getCurrencyInstance()->getPattern(), \sfNumberFormatInfo::getInstance(null, \sfNumberFormatInfo::CURRENCY)->getPattern(), '::getCurrencyInstance() is a shortcut for ::getInstance() and type sfNumberFormatInfo::CURRENCY');
 
 // ::getPercentageInstance()
 $t->diag('::getPercentageInstance()');
-$t->is(sfNumberFormatInfo::getPercentageInstance()->getPattern(), sfNumberFormatInfo::getInstance(null, sfNumberFormatInfo::PERCENTAGE)->getPattern(), '::getPercentageInstance() is a shortcut for ::getInstance() and type sfNumberFormatInfo::PERCENTAGE');
+$t->is(\sfNumberFormatInfo::getPercentageInstance()->getPattern(), \sfNumberFormatInfo::getInstance(null, \sfNumberFormatInfo::PERCENTAGE)->getPattern(), '::getPercentageInstance() is a shortcut for ::getInstance() and type sfNumberFormatInfo::PERCENTAGE');
 
 // ::getScientificInstance()
 $t->diag('::getScientificInstance()');
-$t->is(sfNumberFormatInfo::getScientificInstance()->getPattern(), sfNumberFormatInfo::getInstance(null, sfNumberFormatInfo::SCIENTIFIC)->getPattern(), '::getScientificInstance() is a shortcut for ::getInstance() and type sfNumberFormatInfo::SCIENTIFIC');
+$t->is(\sfNumberFormatInfo::getScientificInstance()->getPattern(), \sfNumberFormatInfo::getInstance(null, \sfNumberFormatInfo::SCIENTIFIC)->getPattern(), '::getScientificInstance() is a shortcut for ::getInstance() and type sfNumberFormatInfo::SCIENTIFIC');
 
-$tests = array(
-    'fr' => array(
+$tests = [
+    'fr' => [
         'DecimalDigits' => -1,
         'DecimalSeparator' => ',',
         'GroupSeparator' => ' ',
@@ -74,8 +75,8 @@
         'NaNSymbol' => 'NaN',
         'PercentSymbol' => '%',
         'PerMilleSymbol' => '‰',
-    ),
-    'en' => array(
+    ],
+    'en' => [
         'DecimalDigits' => -1,
         'DecimalSeparator' => '.',
         'GroupSeparator' => ',',
@@ -87,11 +88,11 @@
         'NaNSymbol' => 'NaN',
         'PercentSymbol' => '%',
         'PerMilleSymbol' => '‰',
-    ),
-);
+    ],
+];
 
 foreach ($tests as $culture => $fixtures) {
-    $n = sfNumberFormatInfo::getInstance($culture);
+    $n = \sfNumberFormatInfo::getInstance($culture);
 
     foreach ($fixtures as $method => $result) {
         $getter = 'get'.$method;
@@ -100,13 +101,13 @@
 }
 
 // setters/getters
-foreach (array(
+foreach ([
     'DecimalDigits', 'DecimalSeparator', 'GroupSeparator',
     'CurrencySymbol', 'NegativeInfinitySymbol', 'PositiveInfinitySymbol',
     'NegativeSign', 'PositiveSign', 'NaNSymbol', 'PercentSymbol', 'PerMilleSymbol',
-) as $method) {
+] as $method) {
     $t->diag(sprintf('->get%s() ->set%s()', $method, $method));
-    $n = sfNumberFormatInfo::getInstance();
+    $n = \sfNumberFormatInfo::getInstance();
     $setter = 'set'.$method;
     $getter = 'get'.$method;
     $n->{$setter}('foo');
@@ -116,14 +117,14 @@
     $t->is($n->{$getter}(), 'bar', sprintf('->%s() is equivalent to ->%s = ', $setter, $method));
 }
 
-foreach (array('GroupSizes', 'NegativePattern', 'PositivePattern') as $method) {
+foreach (['GroupSizes', 'NegativePattern', 'PositivePattern'] as $method) {
     $t->diag(sprintf('->get%s() ->set%s()', $method, $method));
-    $n = sfNumberFormatInfo::getInstance();
+    $n = \sfNumberFormatInfo::getInstance();
     $setter = 'set'.$method;
     $getter = 'get'.$method;
-    $n->{$setter}(array('foo', 'foo'));
-    $t->is($n->{$getter}(), array('foo', 'foo'), sprintf('->%s() sets the current decimal digits', $setter));
+    $n->{$setter}(['foo', 'foo']);
+    $t->is($n->{$getter}(), ['foo', 'foo'], sprintf('->%s() sets the current decimal digits', $setter));
     $t->is($n->{$method}, $n->{$getter}(), sprintf('->%s() is equivalent to ->%s', $getter, $method));
-    $n->{$method} = array('bar', 'bar');
-    $t->is($n->{$getter}(), array('bar', 'bar'), sprintf('->%s() is equivalent to ->%s = ', $setter, $method));
+    $n->{$method} = ['bar', 'bar'];
+    $t->is($n->{$getter}(), ['bar', 'bar'], sprintf('->%s() is equivalent to ->%s = ', $setter, $method));
 }
diff --git a/test/unit/log/sfAggregateLoggerTest.php b/test/unit/log/sfAggregateLoggerTest.php
index 04fb4f380..1e1de0bae 100644
--- a/test/unit/log/sfAggregateLoggerTest.php
+++ b/test/unit/log/sfAggregateLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,26 +11,26 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 require_once __DIR__.'/../../../lib/util/sfToolkit.class.php';
 $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'sf_log_file.txt';
 if (file_exists($file)) {
     unlink($file);
 }
-$fileLogger = new sfFileLogger($dispatcher, array('file' => $file));
+$fileLogger = new \sfFileLogger($dispatcher, ['file' => $file]);
 $buffer = fopen('php://memory', 'rw');
-$streamLogger = new sfStreamLogger($dispatcher, array('stream' => $buffer));
+$streamLogger = new \sfStreamLogger($dispatcher, ['stream' => $buffer]);
 
 // ->initialize()
 $t->diag('->initialize()');
-$logger = new sfAggregateLogger($dispatcher, array('loggers' => $fileLogger));
-$t->is($logger->getLoggers(), array($fileLogger), '->initialize() can take a "loggers" parameter');
+$logger = new \sfAggregateLogger($dispatcher, ['loggers' => $fileLogger]);
+$t->is($logger->getLoggers(), [$fileLogger], '->initialize() can take a "loggers" parameter');
 
-$logger = new sfAggregateLogger($dispatcher, array('loggers' => array($fileLogger, $streamLogger)));
-$t->is($logger->getLoggers(), array($fileLogger, $streamLogger), '->initialize() can take a "loggers" parameter');
+$logger = new \sfAggregateLogger($dispatcher, ['loggers' => [$fileLogger, $streamLogger]]);
+$t->is($logger->getLoggers(), [$fileLogger, $streamLogger], '->initialize() can take a "loggers" parameter');
 
 // ->log()
 $t->diag('->log()');
@@ -41,13 +42,13 @@
 $t->is($content, 'foo'.PHP_EOL, '->log() logs a message to all loggers');
 
 // ->getLoggers() ->addLoggers() ->addLogger()
-$logger = new sfAggregateLogger($dispatcher);
+$logger = new \sfAggregateLogger($dispatcher);
 $logger->addLogger($fileLogger);
-$t->is($logger->getLoggers(), array($fileLogger), '->addLogger() adds a new sfLogger instance');
+$t->is($logger->getLoggers(), [$fileLogger], '->addLogger() adds a new sfLogger instance');
 
-$logger = new sfAggregateLogger($dispatcher);
-$logger->addLoggers(array($fileLogger, $streamLogger));
-$t->is($logger->getLoggers(), array($fileLogger, $streamLogger), '->addLoggers() adds an array of sfLogger instances');
+$logger = new \sfAggregateLogger($dispatcher);
+$logger->addLoggers([$fileLogger, $streamLogger]);
+$t->is($logger->getLoggers(), [$fileLogger, $streamLogger], '->addLoggers() adds an array of sfLogger instances');
 
 // ->shutdown()
 $t->diag('->shutdown()');
diff --git a/test/unit/log/sfConsoleLoggerTest.php b/test/unit/log/sfConsoleLoggerTest.php
index 989ff3a41..de76f7c01 100644
--- a/test/unit/log/sfConsoleLoggerTest.php
+++ b/test/unit/log/sfConsoleLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$logger = new sfConsoleLogger(new sfEventDispatcher());
+$logger = new \sfConsoleLogger(new \sfEventDispatcher());
 $logger->setStream($buffer = fopen('php://memory', 'rw'));
 
 $logger->log('foo');
diff --git a/test/unit/log/sfFileLoggerTest.php b/test/unit/log/sfFileLoggerTest.php
index 72ab44dba..4ea35f721 100644
--- a/test/unit/log/sfFileLoggerTest.php
+++ b/test/unit/log/sfFileLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
 require_once __DIR__.'/../../../lib/util/sfToolkit.class.php';
 $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'sf_log_file.txt';
@@ -18,21 +19,21 @@
     unlink($file);
 }
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // ->initialize()
 $t->diag('->initialize()');
 
 try {
-    $logger = new sfFileLogger($dispatcher);
+    $logger = new \sfFileLogger($dispatcher);
     $t->fail('->initialize() parameters must contains a "file" parameter');
-} catch (sfConfigurationException $e) {
+} catch (\sfConfigurationException $e) {
     $t->pass('->initialize() parameters must contains a "file" parameter');
 }
 
 // ->log()
 $t->diag('->log()');
-$logger = new sfFileLogger($dispatcher, array('file' => $file));
+$logger = new \sfFileLogger($dispatcher, ['file' => $file]);
 $logger->log('foo');
 $lines = explode("\n", file_get_contents($file));
 $t->like($lines[0], '/foo/', '->log() logs a message to the file');
@@ -40,7 +41,7 @@
 $lines = explode("\n", file_get_contents($file));
 $t->like($lines[1], '/bar/', '->log() logs a message to the file');
 
-class TestLogger extends sfFileLogger
+class TestLogger extends \sfFileLogger
 {
     public function getTimeFormat()
     {
@@ -56,28 +57,28 @@ protected function getPriority($priority)
 // option: format
 $t->diag('option: format');
 unlink($file);
-$logger = new TestLogger($dispatcher, array('file' => $file));
+$logger = new \TestLogger($dispatcher, ['file' => $file]);
 $logger->log('foo');
-$t->is(file_get_contents($file), TestLogger::strftime($logger->getTimeFormat()).' symfony [*6*] foo'.PHP_EOL, '->initialize() can take a format option');
+$t->is(file_get_contents($file), \TestLogger::strftime($logger->getTimeFormat()).' symfony [*6*] foo'.PHP_EOL, '->initialize() can take a format option');
 
 unlink($file);
-$logger = new TestLogger($dispatcher, array('file' => $file, 'format' => '%message%'));
+$logger = new \TestLogger($dispatcher, ['file' => $file, 'format' => '%message%']);
 $logger->log('foo');
 $t->is(file_get_contents($file), 'foo', '->initialize() can take a format option');
 
 // option: time_format
 $t->diag('option: time_format');
 unlink($file);
-$logger = new TestLogger($dispatcher, array('file' => $file, 'time_format' => '%Y %m %d'));
+$logger = new \TestLogger($dispatcher, ['file' => $file, 'time_format' => '%Y %m %d']);
 $logger->log('foo');
-$t->is(file_get_contents($file), TestLogger::strftime($logger->getTimeFormat()).' symfony [*6*] foo'.PHP_EOL, '->initialize() can take a format option');
+$t->is(file_get_contents($file), \TestLogger::strftime($logger->getTimeFormat()).' symfony [*6*] foo'.PHP_EOL, '->initialize() can take a format option');
 
 // option: type
 $t->diag('option: type');
 unlink($file);
-$logger = new TestLogger($dispatcher, array('file' => $file, 'type' => 'foo'));
+$logger = new \TestLogger($dispatcher, ['file' => $file, 'type' => 'foo']);
 $logger->log('foo');
-$t->is(file_get_contents($file), TestLogger::strftime($logger->getTimeFormat()).' foo [*6*] foo'.PHP_EOL, '->initialize() can take a format option');
+$t->is(file_get_contents($file), \TestLogger::strftime($logger->getTimeFormat()).' foo [*6*] foo'.PHP_EOL, '->initialize() can take a format option');
 
 // ->shutdown()
 $t->diag('->shutdown()');
diff --git a/test/unit/log/sfLoggerTest.php b/test/unit/log/sfLoggerTest.php
index 36ed81572..5c7a7c10b 100644
--- a/test/unit/log/sfLoggerTest.php
+++ b/test/unit/log/sfLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(136);
+$t = new \lime_test(136);
 
-class myLogger extends sfLogger
+class myLogger extends \sfLogger
 {
     public $log = '';
 
@@ -26,48 +27,48 @@ class notaLogger
 {
 }
 
-$dispatcher = new sfEventDispatcher();
-$logger = new myLogger($dispatcher, array('log_dir_name' => '/tmp'));
+$dispatcher = new \sfEventDispatcher();
+$logger = new \myLogger($dispatcher, ['log_dir_name' => '/tmp']);
 
 $options = $logger->getOptions();
 $t->is($options['log_dir_name'], '/tmp', '->getOptions() returns the options for the logger instance');
 
 // ->setLogLevel() ->getLogLevel()
 $t->diag('->setLogLevel() ->getLogLevel()');
-$t->is($logger->getLogLevel(), sfLogger::INFO, '->getLogLevel() gets the current log level');
-$logger->setLogLevel(sfLogger::WARNING);
-$t->is($logger->getLogLevel(), sfLogger::WARNING, '->setLogLevel() sets the log level');
+$t->is($logger->getLogLevel(), \sfLogger::INFO, '->getLogLevel() gets the current log level');
+$logger->setLogLevel(\sfLogger::WARNING);
+$t->is($logger->getLogLevel(), \sfLogger::WARNING, '->setLogLevel() sets the log level');
 $logger->setLogLevel('err');
-$t->is($logger->getLogLevel(), sfLogger::ERR, '->setLogLevel() accepts a class constant or a string as its argument');
+$t->is($logger->getLogLevel(), \sfLogger::ERR, '->setLogLevel() accepts a class constant or a string as its argument');
 
 // ->initialize()
 $t->diag('->initialize()');
-$logger->initialize($dispatcher, array('level' => sfLogger::ERR));
-$t->is($logger->getLogLevel(), sfLogger::ERR, '->initialize() takes an array of options as its second argument');
+$logger->initialize($dispatcher, ['level' => \sfLogger::ERR]);
+$t->is($logger->getLogLevel(), \sfLogger::ERR, '->initialize() takes an array of options as its second argument');
 
 // ::getPriorityName()
 $t->diag('::getPriorityName()');
-$t->is(sfLogger::getPriorityName(sfLogger::INFO), 'info', '::getPriorityName() returns the name of a priority class constant');
+$t->is(\sfLogger::getPriorityName(\sfLogger::INFO), 'info', '::getPriorityName() returns the name of a priority class constant');
 
 try {
-    sfLogger::getPriorityName(100);
+    \sfLogger::getPriorityName(100);
     $t->fail('::getPriorityName() throws an sfException if the priority constant does not exist');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('::getPriorityName() throws an sfException if the priority constant does not exist');
 }
 
 // ->log()
 $t->diag('->log()');
-$logger->setLogLevel(sfLogger::DEBUG);
+$logger->setLogLevel(\sfLogger::DEBUG);
 $logger->log('message');
 $t->is($logger->log, 'message', '->log() logs a message');
 
 // log level
 $t->diag('log levels');
-foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $level) {
+foreach (['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug'] as $level) {
     $levelConstant = 'sfLogger::'.strtoupper($level);
 
-    foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $logLevel) {
+    foreach (['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug'] as $logLevel) {
         $logLevelConstant = 'sfLogger::'.strtoupper($logLevel);
         $logger->setLogLevel(constant($logLevelConstant));
 
@@ -80,10 +81,10 @@ class notaLogger
 
 // shortcuts
 $t->diag('log shortcuts');
-foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $level) {
+foreach (['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug'] as $level) {
     $levelConstant = 'sfLogger::'.strtoupper($level);
 
-    foreach (array('emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug') as $logLevel) {
+    foreach (['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug'] as $logLevel) {
         $logger->setLogLevel(constant('sfLogger::'.strtoupper($logLevel)));
 
         $logger->log = '';
diff --git a/test/unit/log/sfLoggerWrapperTest.php b/test/unit/log/sfLoggerWrapperTest.php
index 78f5a2d2d..651f40e94 100644
--- a/test/unit/log/sfLoggerWrapperTest.php
+++ b/test/unit/log/sfLoggerWrapperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-class myLogger implements sfLoggerInterface
+class myLogger implements \sfLoggerInterface
 {
     public $log = '';
 
@@ -22,7 +23,7 @@ public function log($message, $priority = null)
     }
 }
 
-class myLoggerWrapper extends sfLoggerWrapper
+class myLoggerWrapper extends \sfLoggerWrapper
 {
     public function getLogger()
     {
@@ -30,11 +31,11 @@ public function getLogger()
     }
 }
 
-$myLogger = new myLogger();
+$myLogger = new \myLogger();
 
 // __construct()
 $t->diag('__construct()');
-$logger = new myLoggerWrapper($myLogger);
+$logger = new \myLoggerWrapper($myLogger);
 $t->is($logger->getLogger(), $myLogger, '__construct() takes a logger that implements sfLoggerInterface as its argument');
 
 // ->log()
diff --git a/test/unit/log/sfStreamLoggerTest.php b/test/unit/log/sfStreamLoggerTest.php
index c0700eab1..2c7f349b0 100644
--- a/test/unit/log/sfStreamLoggerTest.php
+++ b/test/unit/log/sfStreamLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 $buffer = fopen('php://memory', 'rw');
-$logger = new sfStreamLogger($dispatcher, array('stream' => $buffer));
+$logger = new \sfStreamLogger($dispatcher, ['stream' => $buffer]);
 
 $logger->log('foo');
 rewind($buffer);
diff --git a/test/unit/log/sfVarLoggerTest.php b/test/unit/log/sfVarLoggerTest.php
index 2332c032c..5a4d39768 100644
--- a/test/unit/log/sfVarLoggerTest.php
+++ b/test/unit/log/sfVarLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,15 +11,15 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 $buffer = fopen('php://memory', 'rw');
-$logger = new sfVarLogger($dispatcher);
+$logger = new \sfVarLogger($dispatcher);
 
 $logger->log('foo');
-$logger->log('{sfFoo} bar', sfLogger::ERR);
+$logger->log('{sfFoo} bar', \sfLogger::ERR);
 
 $logs = $logger->getLogs();
 $t->is(count($logs), 2, 'sfVarLogger logs all messages into its instance');
diff --git a/test/unit/log/sfWebDebugLoggerTest.php b/test/unit/log/sfWebDebugLoggerTest.php
index 78be837f4..5ddc95445 100644
--- a/test/unit/log/sfWebDebugLoggerTest.php
+++ b/test/unit/log/sfWebDebugLoggerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,11 +13,11 @@
 
 require_once __DIR__.'/../sfContextMock.class.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$context = sfContext::getInstance(array());
-$dispatcher = new sfEventDispatcher();
-$logger = new sfWebDebugLogger($dispatcher);
+$context = \sfContext::getInstance([]);
+$dispatcher = new \sfEventDispatcher();
+$logger = new \sfWebDebugLogger($dispatcher);
 
 // ->handlePhpError()
 $t->diag('->handlePhpError()');
diff --git a/test/unit/mailer/fixtures/TestMailMessage.class.php b/test/unit/mailer/fixtures/TestMailMessage.class.php
index 1e43fc076..ae99a180e 100644
--- a/test/unit/mailer/fixtures/TestMailMessage.class.php
+++ b/test/unit/mailer/fixtures/TestMailMessage.class.php
@@ -1,15 +1,17 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 class TestMailMessage
 {
-    public function setMessage(Swift_Mime_Message $message)
+    public function setMessage(\Swift_Mime_Message $message)
     {
     }
 
diff --git a/test/unit/mailer/fixtures/TestMailerTransport.class.php b/test/unit/mailer/fixtures/TestMailerTransport.class.php
index bcb8f43bd..537cb7197 100644
--- a/test/unit/mailer/fixtures/TestMailerTransport.class.php
+++ b/test/unit/mailer/fixtures/TestMailerTransport.class.php
@@ -1,13 +1,15 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class TestMailerTransport implements Swift_Transport
+
+class TestMailerTransport implements \Swift_Transport
 {
     protected $sleep;
     protected $foo;
@@ -34,7 +36,7 @@ public function stop()
         $this->started = false;
     }
 
-    public function registerPlugin(Swift_Events_EventListener $plugin)
+    public function registerPlugin(\Swift_Events_EventListener $plugin)
     {
     }
 
@@ -53,7 +55,7 @@ public function getSentCount()
         return $this->count;
     }
 
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(\Swift_Mime_Message $message, &$failedRecipients = null)
     {
         ++$this->count;
 
diff --git a/test/unit/mailer/fixtures/TestSpool.class.php b/test/unit/mailer/fixtures/TestSpool.class.php
index f0a80ec00..780af7f16 100644
--- a/test/unit/mailer/fixtures/TestSpool.class.php
+++ b/test/unit/mailer/fixtures/TestSpool.class.php
@@ -1,15 +1,17 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-class TestSpool implements Swift_Spool
+
+class TestSpool implements \Swift_Spool
 {
-    protected $messages = array();
+    protected $messages = [];
 
     public function __construct()
     {
@@ -28,20 +30,20 @@ public function stop()
     {
     }
 
-    public function queueMessage(Swift_Mime_Message $message)
+    public function queueMessage(\Swift_Mime_Message $message)
     {
         $this->messages[] = $message;
 
         return 0;
     }
 
-    public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
+    public function flushQueue(\Swift_Transport $transport, &$failedRecipients = null)
     {
         foreach ($this->messages as $message) {
             $transport->send($message);
         }
 
-        $this->messages = array();
+        $this->messages = [];
     }
 
     public function getMessages()
@@ -56,6 +58,6 @@ public function getQueuedCount()
 
     public function reset()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 }
diff --git a/test/unit/mailer/sfMailerTest.php b/test/unit/mailer/sfMailerTest.php
index 68a3ff23f..7e992e3ee 100755
--- a/test/unit/mailer/sfMailerTest.php
+++ b/test/unit/mailer/sfMailerTest.php
@@ -1,15 +1,17 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/swift_required.php';
+require_once \sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/swift_required.php';
 
 require_once __DIR__.'/fixtures/TestMailerTransport.class.php';
 
@@ -17,109 +19,109 @@
 
 require_once __DIR__.'/fixtures/TestMailMessage.class.php';
 
-$t = new lime_test(34);
+$t = new \lime_test(34);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // __construct()
 $t->diag('__construct()');
 
 try {
-    new sfMailer($dispatcher, array('delivery_strategy' => 'foo'));
+    new \sfMailer($dispatcher, ['delivery_strategy' => 'foo']);
 
     $t->fail('__construct() throws an InvalidArgumentException exception if the strategy is not valid');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException exception if the strategy is not valid');
 }
 
 // main transport
-$mailer = new sfMailer($dispatcher, array(
+$mailer = new \sfMailer($dispatcher, [
     'logging' => true,
     'delivery_strategy' => 'realtime',
-    'transport' => array('class' => 'TestMailerTransport', 'param' => array('foo' => 'bar', 'bar' => 'foo')),
-));
+    'transport' => ['class' => 'TestMailerTransport', 'param' => ['foo' => 'bar', 'bar' => 'foo']],
+]);
 $t->is($mailer->getTransport()->getFoo(), 'bar', '__construct() passes the parameters to the main transport');
 
 // spool
-$mailer = new sfMailer($dispatcher, array(
+$mailer = new \sfMailer($dispatcher, [
     'logging' => true,
     'delivery_strategy' => 'spool',
     'spool_class' => 'TestSpool',
-    'spool_arguments' => array('TestMailMessage'),
-    'transport' => array('class' => 'Swift_SmtpTransport', 'param' => array('username' => 'foo')),
-));
+    'spool_arguments' => ['TestMailMessage'],
+    'transport' => ['class' => 'Swift_SmtpTransport', 'param' => ['username' => 'foo']],
+]);
 $t->is($mailer->getRealTimeTransport()->getUsername(), 'foo', '__construct() passes the parameters to the main transport');
 
 try {
-    $mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'spool'));
+    $mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'spool']);
 
     $t->fail('__construct() throws an InvalidArgumentException exception if the spool_class option is not set with the spool delivery strategy');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException exception if the spool_class option is not set with the spool delivery strategy');
 }
 
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'spool', 'spool_class' => 'TestSpool'));
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'spool', 'spool_class' => 'TestSpool']);
 $t->is(get_class($mailer->getTransport()), 'Swift_SpoolTransport', '__construct() recognizes the spool delivery strategy');
 $t->is(get_class($mailer->getTransport()->getSpool()), 'TestSpool', '__construct() recognizes the spool delivery strategy');
 
 // single address
 try {
-    $mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'single_address'));
+    $mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'single_address']);
 
     $t->fail('__construct() throws an InvalidArgumentException exception if the delivery_address option is not set with the spool single_address strategy');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException exception if the delivery_address option is not set with the spool single_address strategy');
 }
 
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'single_address', 'delivery_address' => 'foo@example.com'));
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'single_address', 'delivery_address' => 'foo@example.com']);
 $t->is($mailer->getDeliveryAddress(), 'foo@example.com', '__construct() recognizes the single_address delivery strategy');
 
 // logging
-$mailer = new sfMailer($dispatcher, array('logging' => false));
+$mailer = new \sfMailer($dispatcher, ['logging' => false]);
 $t->is($mailer->getLogger(), null, '__construct() disables logging if the logging option is set to false');
-$mailer = new sfMailer($dispatcher, array('logging' => true));
-$t->ok($mailer->getLogger() instanceof sfMailerMessageLoggerPlugin, '__construct() enables logging if the logging option is set to true');
+$mailer = new \sfMailer($dispatcher, ['logging' => true]);
+$t->ok($mailer->getLogger() instanceof \sfMailerMessageLoggerPlugin, '__construct() enables logging if the logging option is set to true');
 
 // ->compose()
 $t->diag('->compose()');
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'none'));
-$t->ok($mailer->compose() instanceof Swift_Message, '->compose() returns a Swift_Message instance');
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'none']);
+$t->ok($mailer->compose() instanceof \Swift_Message, '->compose() returns a Swift_Message instance');
 $message = $mailer->compose('from@example.com', 'to@example.com', 'Subject', 'Body');
-$t->is($message->getFrom(), array('from@example.com' => ''), '->compose() takes the from address as its first argument');
-$t->is($message->getTo(), array('to@example.com' => ''), '->compose() takes the to address as its second argument');
+$t->is($message->getFrom(), ['from@example.com' => ''], '->compose() takes the from address as its first argument');
+$t->is($message->getTo(), ['to@example.com' => ''], '->compose() takes the to address as its second argument');
 $t->is($message->getSubject(), 'Subject', '->compose() takes the subject as its third argument');
 $t->is($message->getBody(), 'Body', '->compose() takes the body as its fourth argument');
 
 // ->composeAndSend()
 $t->diag('->composeAndSend()');
-$mailer = new sfMailer($dispatcher, array('logging' => true, 'delivery_strategy' => 'none'));
+$mailer = new \sfMailer($dispatcher, ['logging' => true, 'delivery_strategy' => 'none']);
 $mailer->composeAndSend('from@example.com', 'to@example.com', 'Subject', 'Body');
 $t->is($mailer->getLogger()->countMessages(), 1, '->composeAndSend() composes and sends the message');
 $messages = $mailer->getLogger()->getMessages();
-$t->is($messages[0]->getFrom(), array('from@example.com' => ''), '->composeAndSend() takes the from address as its first argument');
-$t->is($messages[0]->getTo(), array('to@example.com' => ''), '->composeAndSend() takes the to address as its second argument');
+$t->is($messages[0]->getFrom(), ['from@example.com' => ''], '->composeAndSend() takes the from address as its first argument');
+$t->is($messages[0]->getTo(), ['to@example.com' => ''], '->composeAndSend() takes the to address as its second argument');
 $t->is($messages[0]->getSubject(), 'Subject', '->composeAndSend() takes the subject as its third argument');
 $t->is($messages[0]->getBody(), 'Body', '->composeAndSend() takes the body as its fourth argument');
 
 // ->flushQueue()
 $t->diag('->flushQueue()');
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'none'));
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'none']);
 $mailer->composeAndSend('from@example.com', 'to@example.com', 'Subject', 'Body');
 
 try {
     $mailer->flushQueue();
 
     $t->fail('->flushQueue() throws a LogicException exception if the delivery_strategy is not spool');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->flushQueue() throws a LogicException exception if the delivery_strategy is not spool');
 }
 
-$mailer = new sfMailer($dispatcher, array(
+$mailer = new \sfMailer($dispatcher, [
     'delivery_strategy' => 'spool',
     'spool_class' => 'TestSpool',
-    'spool_arguments' => array('TestMailMessage'),
-    'transport' => array('class' => 'TestMailerTransport'),
-));
+    'spool_arguments' => ['TestMailMessage'],
+    'transport' => ['class' => 'TestMailerTransport'],
+]);
 $transport = $mailer->getRealtimeTransport();
 $spool = $mailer->getTransport()->getSpool();
 
@@ -132,13 +134,13 @@
 
 // ->sendNextImmediately()
 $t->diag('->sendNextImmediately()');
-$mailer = new sfMailer($dispatcher, array(
+$mailer = new \sfMailer($dispatcher, [
     'logging' => true,
     'delivery_strategy' => 'spool',
     'spool_class' => 'TestSpool',
-    'spool_arguments' => array('TestMailMessage'),
-    'transport' => array('class' => 'TestMailerTransport'),
-));
+    'spool_arguments' => ['TestMailMessage'],
+    'transport' => ['class' => 'TestMailerTransport'],
+]);
 $transport = $mailer->getRealtimeTransport();
 $spool = $mailer->getTransport()->getSpool();
 $t->is($mailer->sendNextImmediately(), $mailer, '->sendNextImmediately() implements a fluid interface');
@@ -154,23 +156,23 @@
 
 // ->getDeliveryAddress() ->setDeliveryAddress()
 $t->diag('->getDeliveryAddress() ->setDeliveryAddress()');
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'none'));
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'none']);
 $mailer->setDeliveryAddress('foo@example.com');
 $t->is($mailer->getDeliveryAddress(), 'foo@example.com', '->setDeliveryAddress() sets the delivery address for the single_address strategy');
 
 // ->getLogger() ->setLogger()
 $t->diag('->getLogger() ->setLogger()');
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'none'));
-$mailer->setLogger($logger = new sfMailerMessageLoggerPlugin($dispatcher));
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'none']);
+$mailer->setLogger($logger = new \sfMailerMessageLoggerPlugin($dispatcher));
 $t->ok($mailer->getLogger() === $logger, '->setLogger() sets the mailer logger');
 
 // ->getDeliveryStrategy()
 $t->diag('->getDeliveryStrategy()');
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'none'));
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'none']);
 $t->is($mailer->getDeliveryStrategy(), 'none', '->getDeliveryStrategy() returns the delivery strategy');
 
 // ->getRealtimeTransport() ->setRealtimeTransport()
 $t->diag('->getRealtimeTransport() ->setRealtimeTransport()');
-$mailer = new sfMailer($dispatcher, array('delivery_strategy' => 'none'));
-$mailer->setRealtimeTransport($transport = new TestMailerTransport());
+$mailer = new \sfMailer($dispatcher, ['delivery_strategy' => 'none']);
+$mailer->setRealtimeTransport($transport = new \TestMailerTransport());
 $t->ok($mailer->getRealtimeTransport() === $transport, '->setRealtimeTransport() sets the mailer transport');
diff --git a/test/unit/plugin/sfPearDownloaderTest.class.php b/test/unit/plugin/sfPearDownloaderTest.class.php
index 45094e94a..b981e7c86 100644
--- a/test/unit/plugin/sfPearDownloaderTest.class.php
+++ b/test/unit/plugin/sfPearDownloaderTest.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,24 +22,24 @@
  *
  * @coversNothing
  */
-class sfPearDownloaderTest extends sfPearDownloader
+class sfPearDownloaderTest extends \sfPearDownloader
 {
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed|null $callback
-     * @param mixed|null $lastmodified
+     * @param \mixed|null $callback
+     * @param \mixed|null $lastmodified
      */
     public function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null, $accept = false, $channel = false)
     {
         try {
-            $file = sfPluginTestHelper::convertUrlToFixture($url);
-        } catch (sfException $e) {
-            return PEAR::raiseError($e->getMessage());
+            $file = \sfPluginTestHelper::convertUrlToFixture($url);
+        } catch (\sfException $e) {
+            return \PEAR::raiseError($e->getMessage());
         }
 
         if (false === $lastmodified || $lastmodified) {
-            return array($file, 0, array());
+            return [$file, 0, []];
         }
 
         return $file;
diff --git a/test/unit/plugin/sfPearEnvironmentTest.php b/test/unit/plugin/sfPearEnvironmentTest.php
index 72c72b552..2a0c5ec94 100644
--- a/test/unit/plugin/sfPearEnvironmentTest.php
+++ b/test/unit/plugin/sfPearEnvironmentTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
 @include_once 'PEAR.php';
 if (!class_exists('PEAR')) {
@@ -34,37 +35,37 @@
 
 define('SF_PLUGIN_TEST_DIR', $temp);
 
-$options = array(
+$options = [
     'plugin_dir' => $temp.'/plugins',
     'cache_dir' => $temp.'/cache',
     'preferred_state' => 'stable',
     'rest_base_class' => 'sfPearRestTest',
     'downloader_base_class' => 'sfPearDownloaderTest',
-);
+];
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // ->initialize()
 $t->diag('->initialize()');
 
-foreach (array('plugin_dir', 'cache_dir') as $option) {
+foreach (['plugin_dir', 'cache_dir'] as $option) {
     try {
         $localOptions = $options;
         unset($localOptions[$option]);
-        $environment = new sfPearEnvironment($dispatcher, $localOptions);
+        $environment = new \sfPearEnvironment($dispatcher, $localOptions);
 
         $t->fail(sprintf('->initialize() throws an exception if you don\'t pass a "%s" option', $option));
-    } catch (sfException $e) {
+    } catch (\sfException $e) {
         $t->pass(sprintf('->initialize() throws an exception if you don\'t pass a "%s" option', $option));
     }
 }
 
 // ->registerChannel()
 $t->diag('->registerChannel()');
-$environment = new sfPearEnvironment($dispatcher, $options);
+$environment = new \sfPearEnvironment($dispatcher, $options);
 $environment->registerChannel('pear.example.com', true);
 $t->pass('->registerChannel() registers a PEAR channel');
 
 // teardown
-sfToolkit::clearDirectory($temp);
+\sfToolkit::clearDirectory($temp);
 rmdir($temp);
diff --git a/test/unit/plugin/sfPearRestPluginTest.php b/test/unit/plugin/sfPearRestPluginTest.php
index 5c9b8a5c5..b12ad27e6 100644
--- a/test/unit/plugin/sfPearRestPluginTest.php
+++ b/test/unit/plugin/sfPearRestPluginTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(5);
+$t = new \lime_test(5);
 
 @include_once 'PEAR.php';
 if (!class_exists('PEAR')) {
@@ -34,25 +35,25 @@
 
 define('SF_PLUGIN_TEST_DIR', $temp);
 
-$options = array(
+$options = [
     'plugin_dir' => $temp.'/plugins',
     'cache_dir' => $temp.'/cache',
     'preferred_state' => 'stable',
     'rest_base_class' => 'sfPearRestTest',
     'downloader_base_class' => 'sfPearDownloaderTest',
-);
+];
 
-$dispatcher = new sfEventDispatcher();
-$environment = new sfPearEnvironment($dispatcher, $options);
+$dispatcher = new \sfEventDispatcher();
+$environment = new \sfPearEnvironment($dispatcher, $options);
 $environment->registerChannel('pear.example.com', true);
 
 $rest = $environment->getRest();
 
 // ->getPluginVersions()
 $t->diag('->getPluginVersions()');
-$t->is($rest->getPluginVersions('sfTestPlugin'), array('1.1.3', '1.0.3', '1.0.0'), '->getPluginVersions() returns an array of stable versions for a plugin');
-$t->is($rest->getPluginVersions('sfTestPlugin', 'stable'), array('1.1.3', '1.0.3', '1.0.0'), '->getPluginVersions() accepts stability as a second parameter and returns an array of versions for a plugin based on stability');
-$t->is($rest->getPluginVersions('sfTestPlugin', 'beta'), array('1.0.4', '1.1.4', '1.1.3', '1.0.3', '1.0.0'), '->getPluginVersions() accepts stability as a second parameter and returns an array of versions for a plugin based on stability cascade (beta includes stable)');
+$t->is($rest->getPluginVersions('sfTestPlugin'), ['1.1.3', '1.0.3', '1.0.0'], '->getPluginVersions() returns an array of stable versions for a plugin');
+$t->is($rest->getPluginVersions('sfTestPlugin', 'stable'), ['1.1.3', '1.0.3', '1.0.0'], '->getPluginVersions() accepts stability as a second parameter and returns an array of versions for a plugin based on stability');
+$t->is($rest->getPluginVersions('sfTestPlugin', 'beta'), ['1.0.4', '1.1.4', '1.1.3', '1.0.3', '1.0.0'], '->getPluginVersions() accepts stability as a second parameter and returns an array of versions for a plugin based on stability cascade (beta includes stable)');
 
 // ->getPluginDependencies()
 $t->diag('->getPluginDependencies()');
@@ -64,5 +65,5 @@
 $t->is($rest->getPluginDownloadURL('sfTestPlugin', '1.1.3', 'stable'), 'http://pear.example.com/get/sfTestPlugin/sfTestPlugin-1.1.3.tgz', '->getPluginDownloadURL() returns a plugin URL');
 
 // teardown
-sfToolkit::clearDirectory($temp);
+\sfToolkit::clearDirectory($temp);
 rmdir($temp);
diff --git a/test/unit/plugin/sfPearRestTest.class.php b/test/unit/plugin/sfPearRestTest.class.php
index 133bbf358..78fb30142 100644
--- a/test/unit/plugin/sfPearRestTest.class.php
+++ b/test/unit/plugin/sfPearRestTest.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,26 +20,26 @@
  *
  * @coversNothing
  */
-class sfPearRestTest extends sfPearRest
+class sfPearRestTest extends \sfPearRest
 {
     /**
      * @see PEAR_REST::downloadHttp()
      *
-     * @param mixed|null $lastmodified
+     * @param \mixed|null $lastmodified
      */
     public function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
     {
         try {
-            $file = sfPluginTestHelper::convertUrlToFixture($url);
-        } catch (sfException $e) {
-            return PEAR::raiseError($e->getMessage());
+            $file = \sfPluginTestHelper::convertUrlToFixture($url);
+        } catch (\sfException $e) {
+            return \PEAR::raiseError($e->getMessage());
         }
 
-        $headers = array(
+        $headers = [
             'content-type' => preg_match('/\.xml$/', $file) ? 'text/xml' : 'text/plain',
-        );
+        ];
 
-        return array(file_get_contents($file), 0, $headers);
+        return [file_get_contents($file), 0, $headers];
     }
 
     // Disable caching for testing
diff --git a/test/unit/plugin/sfPluginManagerTest.php b/test/unit/plugin/sfPluginManagerTest.php
index 3fd790832..45c776de4 100644
--- a/test/unit/plugin/sfPluginManagerTest.php
+++ b/test/unit/plugin/sfPluginManagerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(40);
+$t = new \lime_test(40);
 
 @include_once 'PEAR.php';
 if (!class_exists('PEAR')) {
@@ -34,17 +35,17 @@
 
 define('SF_PLUGIN_TEST_DIR', $temp);
 
-$options = array(
+$options = [
     'plugin_dir' => $temp.'/plugins',
     'cache_dir' => $temp.'/cache',
     'preferred_state' => 'stable',
     'rest_base_class' => 'sfPearRestTest',
     'downloader_base_class' => 'sfPearDownloaderTest',
-);
+];
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
-class myPluginManager extends sfPluginManager
+class myPluginManager extends \sfPluginManager
 {
     protected $mainPackageVersion = '1.0.0';
 
@@ -58,7 +59,7 @@ public function configure()
     {
         $this->environment->registerChannel('pear.example.com', true);
 
-        $mainPackage = new PEAR_PackageFile_v2_rw();
+        $mainPackage = new \PEAR_PackageFile_v2_rw();
         $mainPackage->setPackage('sfMainPackage');
         $mainPackage->setChannel('pear.example.com');
         $mainPackage->setConfig($this->environment->getConfig());
@@ -80,7 +81,7 @@ public function configure()
 
         $this->environment->getRegistry()->deletePackage('sfMainPackage', 'pear.example.com');
         if (!$this->environment->getRegistry()->addPackage2($mainPackage)) {
-            throw new sfException('Unable to register our sfMainPackage');
+            throw new \sfException('Unable to register our sfMainPackage');
         }
     }
 
@@ -96,8 +97,8 @@ protected function isPluginCompatibleWithDependency($dependency)
 
 // ->initialize()
 $t->diag('->initialize()');
-$environment = new sfPearEnvironment($dispatcher, $options);
-$pluginManager = new myPluginManager($dispatcher, $environment);
+$environment = new \sfPearEnvironment($dispatcher, $options);
+$pluginManager = new \myPluginManager($dispatcher, $environment);
 $t->is($pluginManager->getEnvironment(), $environment, '->initialize() takes a sfPearEnvironment as its second argument');
 
 // ->installPlugin() ->uninstallPlugin()
@@ -108,13 +109,13 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
 $t->ok(!is_file($temp.'/plugins/sfTestPlugin/VERSION'), '->uninstallPlugin() uninstalls a plugin');
 
-$pluginManager->installPlugin('sfTestPlugin', array('stability' => 'beta'));
+$pluginManager->installPlugin('sfTestPlugin', ['stability' => 'beta']);
 $t->is(file_get_contents($temp.'/plugins/sfTestPlugin/VERSION'), '1.0.4', '->installPlugin() can take a stability option');
 
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
 $t->ok(!is_file($temp.'/plugins/sfTestPlugin/VERSION'), '->uninstallPlugin() uninstalls a plugin');
 
-$pluginManager->installPlugin('sfTestPlugin', array('version' => '1.0.0'));
+$pluginManager->installPlugin('sfTestPlugin', ['version' => '1.0.0']);
 $t->is(file_get_contents($temp.'/plugins/sfTestPlugin/VERSION'), '1.0.0', '->installPlugin() can take a version option');
 
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
@@ -123,10 +124,10 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->diag('Try to install a version that won\'t work with our main package');
 
 try {
-    $pluginManager->installPlugin('sfTestPlugin', array('version' => '1.1.3'));
+    $pluginManager->installPlugin('sfTestPlugin', ['version' => '1.1.3']);
 
     $t->fail('->installPlugin() throws an exception if you try to install a version that is not compatible with our main package');
-} catch (sfPluginDependencyException $e) {
+} catch (\sfPluginDependencyException $e) {
     $t->pass('->installPlugin() throws an exception if you try to install a version that is not compatible with our main package');
 }
 
@@ -139,7 +140,7 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
 $t->ok(!is_file($temp.'/plugins/sfTestPlugin/VERSION'), '->uninstallPlugin() uninstalls a plugin');
 
-$pluginManager->installPlugin('sfTestPlugin', array('stability' => 'beta'));
+$pluginManager->installPlugin('sfTestPlugin', ['stability' => 'beta']);
 $t->is(file_get_contents($temp.'/plugins/sfTestPlugin/VERSION'), '1.1.4', '->installPlugin() takes a stability as its 4th argument');
 
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
@@ -154,7 +155,7 @@ protected function isPluginCompatibleWithDependency($dependency)
     $pluginManager->installPlugin('sfBarPlugin');
 
     $t->fail('->installPlugin() throws an exception if the plugin does not exist');
-} catch (sfPluginException $e) {
+} catch (\sfPluginException $e) {
     $t->pass('->installPlugin() throws an exception if the plugin does not exist');
 }
 
@@ -184,8 +185,8 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->diag('->getInstalledPlugins()');
 $pluginManager->installPlugin('sfTestPlugin');
 $installed = $pluginManager->getInstalledPlugins();
-$a = array($installed[0]->getName(), $installed[1]->getName());
-$b = array('sfTestPlugin', 'sfMainPackage');
+$a = [$installed[0]->getName(), $installed[1]->getName()];
+$b = ['sfTestPlugin', 'sfMainPackage'];
 sort($a);
 sort($b);
 $t->is($a, $b, '->getInstalledPlugin() returns an array of installed packages');
@@ -197,18 +198,18 @@ protected function isPluginCompatibleWithDependency($dependency)
 try {
     $pluginManager->installPlugin('sfFooPlugin');
     $t->fail('->installPlugin() throws an exception if the plugin needs a dependency to be installed');
-} catch (sfPluginDependencyException $e) {
+} catch (\sfPluginDependencyException $e) {
     $t->pass('->installPlugin() throws an exception if the plugin needs a dependency to be installed');
 }
 
 $t->diag('install a plugin with a dependency and force installation of all dependencies');
-$pluginManager->installPlugin('sfFooPlugin', array('install_deps' => true));
+$pluginManager->installPlugin('sfFooPlugin', ['install_deps' => true]);
 $t->is(file_get_contents($temp.'/plugins/sfFooPlugin/VERSION'), '1.0.0', '->installPlugin() can take a install_deps option');
 $t->is(file_get_contents($temp.'/plugins/sfTestPlugin/VERSION'), '1.1.3', '->installPlugin() can take a install_deps option');
 $pluginManager->uninstallPlugin('sfFooPlugin');
 $pluginManager->uninstallPlugin('sfTestPlugin');
 
-$pluginManager->installPlugin('sfTestPlugin', array('version' => '1.1.4'));
+$pluginManager->installPlugin('sfTestPlugin', ['version' => '1.1.4']);
 $pluginManager->installPlugin('sfFooPlugin');
 $t->is(file_get_contents($temp.'/plugins/sfFooPlugin/VERSION'), '1.0.0', '->installPlugin() installs a plugin if all dependencies are installed');
 $t->is(file_get_contents($temp.'/plugins/sfTestPlugin/VERSION'), '1.1.4', '->installPlugin() installs a plugin if all dependencies are installed');
@@ -216,13 +217,13 @@ protected function isPluginCompatibleWithDependency($dependency)
 $pluginManager->uninstallPlugin('sfTestPlugin');
 
 $t->diag('try to uninstall a plugin with a depedency must fail');
-$pluginManager->installPlugin('sfTestPlugin', array('version' => '1.1.4'));
+$pluginManager->installPlugin('sfTestPlugin', ['version' => '1.1.4']);
 $pluginManager->installPlugin('sfFooPlugin');
 
 try {
     $pluginManager->uninstallPlugin('sfTestPlugin');
     $t->fail('->uninstallPlugin() throws an exception if you try to uninstall a plugin that is needed for another one');
-} catch (sfPluginException $e) {
+} catch (\sfPluginException $e) {
     $t->pass('->uninstallPlugin() throws an exception if you try to uninstall a plugin that is needed for another one');
 }
 $pluginManager->uninstallPlugin('sfFooPlugin');
@@ -230,26 +231,26 @@ protected function isPluginCompatibleWithDependency($dependency)
 
 $t->diag('install a plugin with a dependency which is installed by with a too old version');
 $pluginManager->setMainPackageVersion('1.0.0');
-$pluginManager->installPlugin('sfTestPlugin', array('version' => '1.0.4'));
+$pluginManager->installPlugin('sfTestPlugin', ['version' => '1.0.4']);
 $pluginManager->setMainPackageVersion('1.1.0');
 
 try {
     $pluginManager->installPlugin('sfFooPlugin');
     $t->fail('->installPlugin() throws an exception if you try to install a plugin with a dependency that is installed but not in the right version');
-} catch (sfPluginDependencyException $e) {
+} catch (\sfPluginDependencyException $e) {
     $t->pass('->installPlugin() throws an exception if you try to install a plugin with a dependency that is installed but not in the right version');
 }
 $pluginManager->uninstallPlugin('sfTestPlugin');
 
 $t->diag('install a plugin with a dependency which is installed with a too old version and you want automatic upgrade');
 $pluginManager->setMainPackageVersion('1.0.0');
-$pluginManager->installPlugin('sfTestPlugin', array('version' => '1.0.4'));
+$pluginManager->installPlugin('sfTestPlugin', ['version' => '1.0.4']);
 $pluginManager->setMainPackageVersion('1.1.0');
-$pluginManager->installPlugin('sfFooPlugin', array('install_deps' => true));
+$pluginManager->installPlugin('sfFooPlugin', ['install_deps' => true]);
 $t->is(file_get_contents($temp.'/plugins/sfFooPlugin/VERSION'), '1.0.0', '->installPlugin() installs a plugin if all dependencies are installed');
 $pluginManager->uninstallPlugin('sfFooPlugin');
 $pluginManager->uninstallPlugin('sfTestPlugin');
 
 // teardown
-sfToolkit::clearDirectory($temp);
+\sfToolkit::clearDirectory($temp);
 rmdir($temp);
diff --git a/test/unit/plugin/sfPluginTestHelper.class.php b/test/unit/plugin/sfPluginTestHelper.class.php
index bb6376581..55e2ef174 100644
--- a/test/unit/plugin/sfPluginTestHelper.class.php
+++ b/test/unit/plugin/sfPluginTestHelper.class.php
@@ -1,10 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class sfPluginTestHelper
 {
     public static function convertUrlToFixture($url)
     {
-        $file = preg_replace(array('/_+/', '#/+#', '#_/#'), array('_', '/', '/'), preg_replace('#[^a-zA-Z0-9\-/\.]#', '_', $url));
+        $file = preg_replace(['/_+/', '#/+#', '#_/#'], ['_', '/', '/'], preg_replace('#[^a-zA-Z0-9\-/\.]#', '_', $url));
 
         $dir = dirname($file);
         $file = basename($file);
@@ -16,7 +25,7 @@ public static function convertUrlToFixture($url)
         }
 
         if (!file_exists(__DIR__.'/fixtures/'.$dir.'/'.$file)) {
-            throw new sfException(sprintf('Unable to find fixture for %s (%s)', $url, $file));
+            throw new \sfException(sprintf('Unable to find fixture for %s (%s)', $url, $file));
         }
 
         copy(__DIR__.'/fixtures/'.$dir.'/'.$file, $dest);
diff --git a/test/unit/request/sfRequestTest.php b/test/unit/request/sfRequestTest.php
index e816325f9..e66e37385 100755
--- a/test/unit/request/sfRequestTest.php
+++ b/test/unit/request/sfRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class myRequest extends sfRequest
+class myRequest extends \sfRequest
 {
     public function getEventDispatcher()
     {
@@ -22,15 +23,15 @@ class fakeRequest
 {
 }
 
-$t = new lime_test(41);
+$t = new \lime_test(41);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // ->initialize()
 $t->diag('->initialize()');
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($dispatcher, $request->getEventDispatcher(), '->initialize() takes a sfEventDispatcher object as its first argument');
-$request->initialize($dispatcher, array('foo' => 'bar'));
+$request->initialize($dispatcher, ['foo' => 'bar']);
 $t->is($request->getParameter('foo'), 'bar', '->initialize() takes an array of parameters as its second argument');
 
 $options = $request->getOptions();
@@ -38,22 +39,22 @@ class fakeRequest
 
 // ->getMethod() ->setMethod()
 $t->diag('->getMethod() ->setMethod()');
-$request->setMethod(sfRequest::GET);
-$t->is($request->getMethod(), sfRequest::GET, '->getMethod() returns the current request method');
+$request->setMethod(\sfRequest::GET);
+$t->is($request->getMethod(), \sfRequest::GET, '->getMethod() returns the current request method');
 
 try {
     $request->setMethod('foo');
     $t->fail('->setMethod() throws a sfException if the method is not valid');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->setMethod() throws a sfException if the method is not valid');
 }
 
 // ->extractParameters()
 $t->diag('->extractParameters()');
-$request->initialize($dispatcher, array('foo' => 'foo', 'bar' => 'bar'));
-$t->is($request->extractParameters(array()), array(), '->extractParameters() returns parameters');
-$t->is($request->extractParameters(array('foo')), array('foo' => 'foo'), '->extractParameters() returns parameters for keys in its first parameter');
-$t->is($request->extractParameters(array('bar')), array('bar' => 'bar'), '->extractParameters() returns parameters for keys in its first parameter');
+$request->initialize($dispatcher, ['foo' => 'foo', 'bar' => 'bar']);
+$t->is($request->extractParameters([]), [], '->extractParameters() returns parameters');
+$t->is($request->extractParameters(['foo']), ['foo' => 'foo'], '->extractParameters() returns parameters for keys in its first parameter');
+$t->is($request->extractParameters(['bar']), ['bar' => 'bar'], '->extractParameters() returns parameters for keys in its first parameter');
 
 // array access for request parameters
 $t->diag('Array access for request parameters');
@@ -70,30 +71,30 @@ class fakeRequest
 
 // ->getOption()
 $t->diag('->getOption()');
-$request = new myRequest($dispatcher, array(), array(), array('val_1' => 'value', 'val_2' => false));
+$request = new \myRequest($dispatcher, [], [], ['val_1' => 'value', 'val_2' => false]);
 $t->is($request->getOption('val_1'), 'value', '->getOption() returns the option value if exists');
 $t->is($request->getOption('val_2'), false, '->getOption() returns the option value if exists');
 $t->is($request->getOption('none'), null, '->getOption() returns the option value if not exists');
 
 // ->getOption()
 $t->diag('->__clone()');
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $requestClone = clone $request;
 $t->ok($request->getParameterHolder() !== $requestClone->getParameterHolder(), '->__clone() clone parameterHolder');
 $t->ok($request->getAttributeHolder() !== $requestClone->getAttributeHolder(), '->__clone() clone attributeHolder');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 
 // parameter holder proxy
 require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
-$pht = new sfParameterHolderProxyTest($t);
+$pht = new \sfParameterHolderProxyTest($t);
 $pht->launchTests($request, 'parameter');
 
 // attribute holder proxy
-$pht = new sfParameterHolderProxyTest($t);
+$pht = new \sfParameterHolderProxyTest($t);
 $pht->launchTests($request, 'attribute');
 
 // new methods via sfEventDispatcher
 require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
-$dispatcherTest = new sfEventDispatcherTest($t);
+$dispatcherTest = new \sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($dispatcher, $request, 'request');
diff --git a/test/unit/request/sfWebRequestTest.php b/test/unit/request/sfWebRequestTest.php
index f505e358c..a67254ec3 100644
--- a/test/unit/request/sfWebRequestTest.php
+++ b/test/unit/request/sfWebRequestTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,16 +11,16 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(109);
+$t = new \lime_test(109);
 
-class myRequest extends sfWebRequest
+class myRequest extends \sfWebRequest
 {
     public $languages;
     public $charsets;
     public $acceptableContentTypes;
     protected static $initialPathArrayKeys;
 
-    public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, $parameters = [], $attributes = [], $options = [])
     {
         if (isset($options['content_custom_only_for_test'])) {
             $this->content = $options['content_custom_only_for_test'];
@@ -48,86 +49,86 @@ public function resetPathInfoArray()
     }
 }
 
-$dispatcher = new sfEventDispatcher();
-$request = new myRequest($dispatcher);
+$dispatcher = new \sfEventDispatcher();
+$request = new \myRequest($dispatcher);
 
 // ->getLanguages()
 $t->diag('->getLanguages()');
 
-$t->is($request->getLanguages(), array(), '->getLanguages() returns an empty array if the client do not send an ACCEPT_LANGUAGE header');
+$t->is($request->getLanguages(), [], '->getLanguages() returns an empty array if the client do not send an ACCEPT_LANGUAGE header');
 
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = '';
-$t->is($request->getLanguages(), array(), '->getLanguages() returns an empty array if the client send an empty ACCEPT_LANGUAGE header');
+$t->is($request->getLanguages(), [], '->getLanguages() returns an empty array if the client send an empty ACCEPT_LANGUAGE header');
 
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr;q=0.3';
-$t->is($request->getLanguages(), array('en_US', 'en', 'fr'), '->getLanguages() returns an array with all accepted languages');
+$t->is($request->getLanguages(), ['en_US', 'en', 'fr'], '->getLanguages() returns an array with all accepted languages');
 
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'i-cherokee';
-$t->is($request->getLanguages(), array('cherokee'), '->getLanguages() returns an array with all accepted languages');
+$t->is($request->getLanguages(), ['cherokee'], '->getLanguages() returns an array with all accepted languages');
 
 // ->getPreferredCulture()
 $t->diag('->getPreferredCulture()');
 
-$request->languages = array('fr');
+$request->languages = ['fr'];
 $t->is($request->getPreferredCulture(), 'fr', '->getPreferredCulture() returns the first given languages if no parameter given');
 
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = '';
-$t->is($request->getPreferredCulture(array('fr', 'en')), 'fr', '->getPreferredCulture() returns the first given culture if the client do not send an ACCEPT_LANGUAGE header');
+$t->is($request->getPreferredCulture(['fr', 'en']), 'fr', '->getPreferredCulture() returns the first given culture if the client do not send an ACCEPT_LANGUAGE header');
 
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr;q=0.3';
-$t->is($request->getPreferredCulture(array('fr', 'en')), 'en', '->getPreferredCulture() returns the preferred culture');
+$t->is($request->getPreferredCulture(['fr', 'en']), 'en', '->getPreferredCulture() returns the preferred culture');
 
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr';
-$t->is($request->getPreferredCulture(array('fr', 'en')), 'fr', '->getPreferredCulture() returns the preferred culture');
+$t->is($request->getPreferredCulture(['fr', 'en']), 'fr', '->getPreferredCulture() returns the preferred culture');
 
 // ->getCharsets()
 $t->diag('->getCharsets()');
 
-$t->is($request->getCharsets(), array(), '->getCharsets() returns an empty array if the client do not send an ACCEPT_CHARSET header');
+$t->is($request->getCharsets(), [], '->getCharsets() returns an empty array if the client do not send an ACCEPT_CHARSET header');
 
-$request->charsets = array('ISO-8859-1');
-$t->is($request->getCharsets(), array('ISO-8859-1'), '->getCharsets() returns an empty array if charsets are already defined');
+$request->charsets = ['ISO-8859-1'];
+$t->is($request->getCharsets(), ['ISO-8859-1'], '->getCharsets() returns an empty array if charsets are already defined');
 
 $request->charsets = null;
 $_SERVER['HTTP_ACCEPT_CHARSET'] = '';
-$t->is($request->getCharsets(), array(), '->getCharsets() returns an empty array if the client send an empty ACCEPT_CHARSET header');
+$t->is($request->getCharsets(), [], '->getCharsets() returns an empty array if the client send an empty ACCEPT_CHARSET header');
 
 $request->charsets = null;
 $_SERVER['HTTP_ACCEPT_CHARSET'] = 'ISO-8859-1,utf-8;q=0.7,*;q=0.3';
-$t->is($request->getCharsets(), array('ISO-8859-1', 'utf-8', '*'), '->getCharsets() returns an array with all accepted charsets');
+$t->is($request->getCharsets(), ['ISO-8859-1', 'utf-8', '*'], '->getCharsets() returns an array with all accepted charsets');
 
 // ->getAcceptableContentTypes()
 $t->diag('->getAcceptableContentTypes()');
 
-$t->is($request->getAcceptableContentTypes(), array(), '->getAcceptableContentTypes() returns an empty array if the client do not send an ACCEPT header');
+$t->is($request->getAcceptableContentTypes(), [], '->getAcceptableContentTypes() returns an empty array if the client do not send an ACCEPT header');
 
-$request->acceptableContentTypes = array('text/xml');
-$t->is($request->getAcceptableContentTypes(), array('text/xml'), '->getAcceptableContentTypes() returns an empty array if acceptableContentTypes are already set');
+$request->acceptableContentTypes = ['text/xml'];
+$t->is($request->getAcceptableContentTypes(), ['text/xml'], '->getAcceptableContentTypes() returns an empty array if acceptableContentTypes are already set');
 
 $request->acceptableContentTypes = null;
 $_SERVER['HTTP_ACCEPT'] = '';
-$t->is($request->getAcceptableContentTypes(), array(), '->getAcceptableContentTypes() returns an empty array if the client send an empty ACCEPT header');
+$t->is($request->getAcceptableContentTypes(), [], '->getAcceptableContentTypes() returns an empty array if the client send an empty ACCEPT header');
 
 $request->acceptableContentTypes = null;
 $_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xhtml+xml,application/xml,text/html;q=0.9,text/plain;q=0.8,*/*;q=0.5';
-$t->is($request->getAcceptableContentTypes(), array('text/xml', 'application/xhtml+xml', 'application/xml', 'text/html', 'text/plain', '*/*'), '->getAcceptableContentTypes() returns an array with all accepted content types');
+$t->is($request->getAcceptableContentTypes(), ['text/xml', 'application/xhtml+xml', 'application/xml', 'text/html', 'text/plain', '*/*'], '->getAcceptableContentTypes() returns an array with all accepted content types');
 
 // ->splitHttpAcceptHeader()
 $t->diag('->splitHttpAcceptHeader()');
 
-$t->is($request->splitHttpAcceptHeader(''), array(), '->splitHttpAcceptHeader() returns an empty array if the header is empty');
-$t->is($request->splitHttpAcceptHeader('a,b,c'), array('a', 'b', 'c'), '->splitHttpAcceptHeader() returns an array of values');
-$t->is($request->splitHttpAcceptHeader('a,b;q=0.7,c;q=0.3'), array('a', 'b', 'c'), '->splitHttpAcceptHeader() strips the q value');
-$t->is($request->splitHttpAcceptHeader('a;q=0.1,b,c;q=0.3'), array('b', 'c', 'a'), '->splitHttpAcceptHeader() sorts values by the q value');
-$t->is($request->splitHttpAcceptHeader('a;q=0.3,b,c;q=0.3'), array('b', 'a', 'c'), '->splitHttpAcceptHeader() sorts values by the q value including equal values');
-$t->is($request->splitHttpAcceptHeader('a; q=0.1, b, c; q=0.3'), array('b', 'c', 'a'), '->splitHttpAcceptHeader() trims whitespaces');
-$t->is($request->splitHttpAcceptHeader('a; q=0, b'), array('b'), '->splitHttpAcceptHeader() removes values when q = 0 (as per the RFC)');
+$t->is($request->splitHttpAcceptHeader(''), [], '->splitHttpAcceptHeader() returns an empty array if the header is empty');
+$t->is($request->splitHttpAcceptHeader('a,b,c'), ['a', 'b', 'c'], '->splitHttpAcceptHeader() returns an array of values');
+$t->is($request->splitHttpAcceptHeader('a,b;q=0.7,c;q=0.3'), ['a', 'b', 'c'], '->splitHttpAcceptHeader() strips the q value');
+$t->is($request->splitHttpAcceptHeader('a;q=0.1,b,c;q=0.3'), ['b', 'c', 'a'], '->splitHttpAcceptHeader() sorts values by the q value');
+$t->is($request->splitHttpAcceptHeader('a;q=0.3,b,c;q=0.3'), ['b', 'a', 'c'], '->splitHttpAcceptHeader() sorts values by the q value including equal values');
+$t->is($request->splitHttpAcceptHeader('a; q=0.1, b, c; q=0.3'), ['b', 'c', 'a'], '->splitHttpAcceptHeader() trims whitespaces');
+$t->is($request->splitHttpAcceptHeader('a; q=0, b'), ['b'], '->splitHttpAcceptHeader() removes values when q = 0 (as per the RFC)');
 
 // ->getRequestFormat() ->setRequestFormat()
 $t->diag('->getRequestFormat() ->setRequestFormat()');
@@ -142,12 +143,12 @@ public function resetPathInfoArray()
 // ->getFormat() ->setFormat()
 $t->diag('->getFormat() ->setFormat()');
 
-$customRequest = new myRequest($dispatcher, array(), array(), array('formats' => array('custom' => 'application/custom')));
+$customRequest = new \myRequest($dispatcher, [], [], ['formats' => ['custom' => 'application/custom']]);
 $t->is($customRequest->getFormat('application/custom'), 'custom', '->getFormat() returns the format for the given mime type if when is set as initialisation option');
 
 $request->setFormat('js', 'application/x-javascript');
 $t->is($request->getFormat('application/x-javascript'), 'js', '->getFormat() returns the format for the given mime type');
-$request->setFormat('js', array('application/x-javascript', 'text/js'));
+$request->setFormat('js', ['application/x-javascript', 'text/js']);
 $t->is($request->getFormat('text/js'), 'js', '->setFormat() can take an array of mime types');
 $t->is($request->getFormat('foo/bar'), null, '->getFormat() returns null if the mime type does not exist');
 
@@ -266,7 +267,7 @@ public function resetPathInfoArray()
 
 $t->is($request->getForwardedFor(), null, '->getForwardedFor() returns null if the request was not forwarded.');
 $_SERVER['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.2';
-$t->is_deeply($request->getForwardedFor(), array('10.0.0.1', '10.0.0.2'), '->getForwardedFor() returns the value from HTTP_X_FORWARDED_FOR');
+$t->is_deeply($request->getForwardedFor(), ['10.0.0.1', '10.0.0.2'], '->getForwardedFor() returns the value from HTTP_X_FORWARDED_FOR');
 
 // ->getClientIp()
 $t->diag('->getClientIp()');
@@ -299,8 +300,8 @@ public function resetPathInfoArray()
 $t->diag('->getGetParameters() ->getGetParameter()');
 
 $_GET['get_param'] = 'value';
-$request = new myRequest($dispatcher);
-$t->is($request->getGetParameters(), array('get_param' => 'value'), '->getGetParameters() returns GET parameters');
+$request = new \myRequest($dispatcher);
+$t->is($request->getGetParameters(), ['get_param' => 'value'], '->getGetParameters() returns GET parameters');
 $t->is($request->getGetParameter('get_param'), 'value', '->getGetParameter() returns GET parameter by name');
 unset($_GET['get_param']);
 
@@ -308,8 +309,8 @@ public function resetPathInfoArray()
 $t->diag('->getPostParameters() ->getPostParameter()');
 
 $_POST['post_param'] = 'value';
-$request = new myRequest($dispatcher);
-$t->is($request->getPostParameters(), array('post_param' => 'value'), '->getPostParameters() returns POST parameters');
+$request = new \myRequest($dispatcher);
+$t->is($request->getPostParameters(), ['post_param' => 'value'], '->getPostParameters() returns POST parameters');
 $t->is($request->getPostParameter('post_param'), 'value', '->getPostParameter() returns POST parameter by name');
 unset($_POST['post_param']);
 
@@ -317,67 +318,67 @@ public function resetPathInfoArray()
 $t->diag('->getMethod()');
 
 $_SERVER['REQUEST_METHOD'] = 'none';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'GET', '->getMethod() returns GET by default');
 
 $_SERVER['REQUEST_METHOD'] = 'GET';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'GET', '->getMethod() returns GET if the method is GET');
 
 $_SERVER['REQUEST_METHOD'] = 'PUT';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'PUT', '->getMethod() returns PUT if the method is PUT');
 
 $_SERVER['REQUEST_METHOD'] = 'PUT';
 $_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
-$request = new myRequest($dispatcher, array(), array(), array('content_custom_only_for_test' => 'first=value'));
+$request = new \myRequest($dispatcher, [], [], ['content_custom_only_for_test' => 'first=value']);
 $t->is($request->getPostParameter('first'), 'value', '->getMethod() set POST parameters from parsed content if content type is "application/x-www-form-urlencoded" and the method is PUT');
 unset($_POST['first'], $_SERVER['CONTENT_TYPE']);
 
 $_SERVER['REQUEST_METHOD'] = 'DELETE';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'DELETE', '->getMethod() returns DELETE if the method is DELETE');
 
 $_SERVER['REQUEST_METHOD'] = 'DELETE';
 $_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
-$request = new myRequest($dispatcher, array(), array(), array('content_custom_only_for_test' => 'first=value'));
+$request = new \myRequest($dispatcher, [], [], ['content_custom_only_for_test' => 'first=value']);
 $t->is($request->getPostParameter('first'), 'value', '->getMethod() set POST parameters from parsed content if content type is "application/x-www-form-urlencoded" and the method is DELETE');
 unset($_POST['first'], $_SERVER['CONTENT_TYPE']);
 
 $_SERVER['REQUEST_METHOD'] = 'HEAD';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'HEAD', '->getMethod() returns DELETE if the method is HEAD');
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST['sf_method'] = 'PUT';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'PUT', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
 
 $_SERVER['REQUEST_METHOD'] = 'GET';
 $_POST['sf_method'] = 'PUT';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'GET', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
 unset($_POST['sf_method']);
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'POST', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_GET['sf_method'] = 'PUT';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'PUT', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
 unset($_GET['sf_method']);
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getMethod(), 'POST', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
 
 // ->isMethod()
 $t->diag('->isMethod()');
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->ok($request->isMethod('POST'), '->isMethod() returns true if the method is POST');
 
 // ->isXmlHttpRequest()
@@ -390,57 +391,57 @@ public function resetPathInfoArray()
 $t->diag('->getCookie()');
 
 $_COOKIE['test'] = 'value';
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getCookie('test'), 'value', '->getCookie() returns value of cookie');
 
 // ->getScriptName()
 $t->diag('->getScriptName()');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['SCRIPT_NAME'] = '/frontend_test.php';
 $_SERVER['ORIG_SCRIPT_NAME'] = '/frontend_test2.php';
 $t->is($request->getScriptName(), '/frontend_test.php', '->getScriptName() returns the script name');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 unset($_SERVER['SCRIPT_NAME']);
 $_SERVER['ORIG_SCRIPT_NAME'] = '/frontend_test2.php';
 $t->is($request->getScriptName(), '/frontend_test2.php', '->getScriptName() returns the script name if SCRIPT_NAME not set it use ORIG_SCRIPT_NAME');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 unset($_SERVER['SCRIPT_NAME']);
 $t->is($request->getScriptName(), '', '->getScriptName() returns the script name if SCRIPT_NAME and ORIG_SCRIPT_NAME not set it return empty');
 
 // ->getPathInfo()
 $t->diag('->getPathInfo()');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $options = $request->getOptions();
 $t->is($options['path_info_key'], 'PATH_INFO', 'check if default path_info_key is PATH_INFO');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['PATH_INFO'] = '/test/klaus';
 $_SERVER['REQUEST_URI'] = '/test/klaus2';
 $t->is($request->getPathInfo(), '/test/klaus', '->getPathInfo() returns the url path value');
 
-$request = new myRequest($dispatcher, array(), array(), array('path_info_key' => 'SPECIAL'));
+$request = new \myRequest($dispatcher, [], [], ['path_info_key' => 'SPECIAL']);
 $_SERVER['SPECIAL'] = '/special';
 $t->is($request->getPathInfo(), '/special', '->getPathInfo() returns the url path value use path_info_key');
 $request->resetPathInfoArray();
 
 $request->resetPathInfoArray();
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['SCRIPT_NAME'] = '/frontend_test.php';
 $_SERVER['REQUEST_URI'] = '/frontend_test.php/test/klaus2';
 $_SERVER['QUERY_STRING'] = '';
 $t->is($request->getPathInfo(), '/test/klaus2', '->getPathInfo() returns the url path value if it not exists use default REQUEST_URI');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['QUERY_STRING'] = 'test';
 $_SERVER['REQUEST_URI'] = '/frontend_test.php/test/klaus2?test';
 $t->is($request->getPathInfo(), '/test/klaus2', '->getPathInfo() returns the url path value if it not exists use default REQUEST_URI without query');
 
 $request->resetPathInfoArray();
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $t->is($request->getPathInfo(), '/', '->getPathInfo() returns the url path value if it not exists use default /');
 
 // -setRelativeUrlRoot() ->getRelativeUrlRoot()
@@ -452,17 +453,17 @@ public function resetPathInfoArray()
 // ->addRequestParameters() ->getRequestParameters() ->fixParameters()
 $t->diag('->addRequestParameters() ->getRequestParameters() ->fixParameters()');
 
-$request = new myRequest($dispatcher);
-$t->is($request->getRequestParameters(), array(), '->getRequestParameters() returns the request parameters default array');
+$request = new \myRequest($dispatcher);
+$t->is($request->getRequestParameters(), [], '->getRequestParameters() returns the request parameters default array');
 
-$request->addRequestParameters(array('test' => 'test'));
-$t->is($request->getRequestParameters(), array('test' => 'test'), '->getRequestParameters() returns the request parameters');
+$request->addRequestParameters(['test' => 'test']);
+$t->is($request->getRequestParameters(), ['test' => 'test'], '->getRequestParameters() returns the request parameters');
 
-$request->addRequestParameters(array('test' => 'test'));
-$t->is($request->getRequestParameters(), array('test' => 'test'), '->getRequestParameters() returns the request parameters allready exists');
+$request->addRequestParameters(['test' => 'test']);
+$t->is($request->getRequestParameters(), ['test' => 'test'], '->getRequestParameters() returns the request parameters allready exists');
 
-$request->addRequestParameters(array('_sf_ignore_cache' => 1, 'test2' => 'test2'));
-$t->is($request->getRequestParameters(), array('test' => 'test', 'test2' => 'test2', '_sf_ignore_cache' => 1), '->getRequestParameters() returns the request parameters check fixParameters call for special _sf_ params');
+$request->addRequestParameters(['_sf_ignore_cache' => 1, 'test2' => 'test2']);
+$t->is($request->getRequestParameters(), ['test' => 'test', 'test2' => 'test2', '_sf_ignore_cache' => 1], '->getRequestParameters() returns the request parameters check fixParameters call for special _sf_ params');
 $t->is($request->getAttribute('sf_ignore_cache'), 1, '->getAttribute() check special param is set as attribute');
 
 // ->getUrlParameter
@@ -472,7 +473,7 @@ public function resetPathInfoArray()
 // ->checkCSRFProtection()
 $t->diag('->checkCSRFProtection()');
 
-class BaseForm extends sfForm
+class BaseForm extends \sfForm
 {
     public function getCSRFToken($secret = null)
     {
@@ -480,34 +481,34 @@ public function getCSRFToken($secret = null)
     }
 }
 
-sfForm::enableCSRFProtection();
+\sfForm::enableCSRFProtection();
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 
 try {
     $request->checkCSRFProtection();
     $t->fail('->checkCSRFProtection() throws a validator error if CSRF protection fails');
-} catch (sfValidatorErrorSchema $error) {
+} catch (\sfValidatorErrorSchema $error) {
     $t->pass('->checkCSRFProtection() throws a validator error if CSRF protection fails');
 }
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $request->setParameter('_csrf_token', '==TOKEN==');
 
 try {
     $request->checkCSRFProtection();
     $t->pass('->checkCSRFProtection() checks token from BaseForm');
-} catch (sfValidatorErrorSchema $error) {
+} catch (\sfValidatorErrorSchema $error) {
     $t->fail('->checkCSRFProtection() checks token from BaseForm');
 }
 
 // ->getContentType()
 $t->diag('->getContentType()');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['CONTENT_TYPE'] = 'text/html';
 $t->is($request->getContentType(), 'text/html', '->getContentType() returns the content type');
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['CONTENT_TYPE'] = 'text/html; charset=UTF-8';
 $t->is($request->getContentType(), 'text/html', '->getContentType() strips the charset information by default');
 $t->is($request->getContentType(false), 'text/html; charset=UTF-8', '->getContentType() does not strip the charset information by defaultif you pass false as the first argument');
@@ -515,14 +516,14 @@ public function getCSRFToken($secret = null)
 // ->getReferer()
 $t->diag('->getReferer()');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['HTTP_REFERER'] = 'http://domain';
 $t->is($request->getReferer(), 'http://domain', '->getContentType() returns the content type');
 
 // ->getHost()
 $t->diag('->getHost()');
 
-$request = new myRequest($dispatcher);
+$request = new \myRequest($dispatcher);
 $_SERVER['HTTP_X_FORWARDED_HOST'] = 'example1.com, example2.com, example3.com';
 $t->is($request->getHost(), 'example3.com', '->getHost() returns the last forwarded host');
 unset($_SERVER['HTTP_X_FORWARDED_HOST']);
@@ -538,34 +539,34 @@ public function getCSRFToken($secret = null)
 // ->getFiles()
 $t->diag('->getFiles()');
 
-$_FILES = array(
-    'article' => array(
-        'name' => array(
+$_FILES = [
+    'article' => [
+        'name' => [
             'media' => '1.png',
-        ),
-        'type' => array(
+        ],
+        'type' => [
             'media' => 'image/png',
-        ),
-        'tmp_name' => array(
+        ],
+        'tmp_name' => [
             'media' => '/private/var/tmp/phpnTrAJG',
-        ),
-        'error' => array(
+        ],
+        'error' => [
             'media' => 0,
-        ),
-        'size' => array(
+        ],
+        'size' => [
             'media' => 899,
-        ),
-    ),
-);
-$taintedFiles = array(
-    'article' => array(
-        'media' => array(
+        ],
+    ],
+];
+$taintedFiles = [
+    'article' => [
+        'media' => [
             'error' => 0,
             'name' => '1.png',
             'type' => 'image/png',
             'tmp_name' => '/private/var/tmp/phpnTrAJG',
             'size' => 899,
-        ),
-    ),
-);
+        ],
+    ],
+];
 $t->is_deeply($request->getFiles(), $taintedFiles, '->getFiles() return clean array extracted from $_FILES');
diff --git a/test/unit/response/sfResponseTest.php b/test/unit/response/sfResponseTest.php
index 997b2d800..c010d8057 100644
--- a/test/unit/response/sfResponseTest.php
+++ b/test/unit/response/sfResponseTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class myResponse extends sfResponse
+class myResponse extends \sfResponse
 {
     public function __serialize()
     {
@@ -33,13 +34,13 @@ class fakeResponse
 {
 }
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // ->initialize()
 $t->diag('->initialize()');
-$response = new myResponse($dispatcher, array('foo' => 'bar'));
+$response = new \myResponse($dispatcher, ['foo' => 'bar']);
 $options = $response->getOptions();
 $t->is($options['foo'], 'bar', '->initialize() takes an array of options as its second argument');
 $t->is($options['logging'], false, '->getOptions() returns options for response instance');
@@ -59,9 +60,9 @@ class fakeResponse
 
 // ->serialize() ->unserialize()
 $t->diag('->serialize() ->unserialize()');
-$t->ok(new myResponse($dispatcher) instanceof Serializable, 'sfResponse implements the Serializable interface');
+$t->ok(new \myResponse($dispatcher) instanceof \Serializable, 'sfResponse implements the Serializable interface');
 
 // new methods via sfEventDispatcher
 require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
-$dispatcherTest = new sfEventDispatcherTest($t);
+$dispatcherTest = new \sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($dispatcher, $response, 'response');
diff --git a/test/unit/response/sfWebResponseTest.php b/test/unit/response/sfWebResponseTest.php
index b8a81c3eb..8a4b55c76 100644
--- a/test/unit/response/sfWebResponseTest.php
+++ b/test/unit/response/sfWebResponseTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(89);
+$t = new \lime_test(89);
 
-class myWebResponse extends sfWebResponse
+class myWebResponse extends \sfWebResponse
 {
     public function getStatusText()
     {
@@ -25,16 +26,16 @@ public function normalizeHeaderName($name)
     }
 }
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 // ->initialize()
 $t->diag('->initialize()');
-$response = new myWebResponse($dispatcher, array('charset' => 'ISO-8859-1'));
+$response = new \myWebResponse($dispatcher, ['charset' => 'ISO-8859-1']);
 $t->is($response->getContentType(), 'text/html; charset=ISO-8859-1', '->initialize() takes a "charset" option');
-$response = new myWebResponse($dispatcher, array('content_type' => 'text/plain'));
+$response = new \myWebResponse($dispatcher, ['content_type' => 'text/plain']);
 $t->is($response->getContentType(), 'text/plain; charset=utf-8', '->initialize() takes a "content_type" option');
 
-$response = new myWebResponse($dispatcher);
+$response = new \myWebResponse($dispatcher);
 
 // ->getStatusCode() ->setStatusCode()
 $t->diag('->getStatusCode() ->setStatusCode()');
@@ -84,28 +85,28 @@ public function normalizeHeaderName($name)
 $response->setHttpHeader('my-header', 'foo');
 $response->setHttpHeader('my-header', 'bar', false);
 $response->setHttpHeader('another', 'foo');
-$t->is($response->getHttpHeaders(), array('My-Header' => 'foo, bar', 'Another' => 'foo'), '->getHttpHeaders() return all current response http headers');
+$t->is($response->getHttpHeaders(), ['My-Header' => 'foo, bar', 'Another' => 'foo'], '->getHttpHeaders() return all current response http headers');
 
 // ->normalizeHeaderName()
 $t->diag('->normalizeHeaderName()');
-foreach (array(
-    array('header', 'Header'),
-    array('HEADER', 'Header'),
-    array('hEaDeR', 'Header'),
-    array('my-header', 'My-Header'),
-    array('my_header', 'My-Header'),
-    array('MY_HEADER', 'My-Header'),
-    array('my-header_is_very-long', 'My-Header-Is-Very-Long'),
-    array('Content-Type', 'Content-Type'),
-    array('content-type', 'Content-Type'),
-) as $test) {
+foreach ([
+    ['header', 'Header'],
+    ['HEADER', 'Header'],
+    ['hEaDeR', 'Header'],
+    ['my-header', 'My-Header'],
+    ['my_header', 'My-Header'],
+    ['MY_HEADER', 'My-Header'],
+    ['my-header_is_very-long', 'My-Header-Is-Very-Long'],
+    ['Content-Type', 'Content-Type'],
+    ['content-type', 'Content-Type'],
+] as $test) {
     $t->is($response->normalizeHeaderName($test[0]), $test[1], '->normalizeHeaderName() normalizes http header name');
 }
 
 // ->getContentType() ->setContentType()
 $t->diag('->getContentType() ->setContentType() ->getCharset()');
 
-$response = new myWebResponse($dispatcher);
+$response = new \myWebResponse($dispatcher);
 $t->is($response->getContentType(), 'text/html; charset=utf-8', '->getContentType() returns a sensible default value');
 $t->is($response->getCharset(), 'utf-8', '->getCharset() returns the current charset of the response');
 
@@ -187,8 +188,8 @@ public function normalizeHeaderName($name)
 
 // ->copyProperties()
 $t->diag('->copyProperties()');
-$response1 = new myWebResponse($dispatcher);
-$response2 = new myWebResponse($dispatcher);
+$response1 = new \myWebResponse($dispatcher);
+$response2 = new \myWebResponse($dispatcher);
 
 $response1->setHttpHeader('symfony', 'foo');
 $response1->setContentType('text/plain');
@@ -201,7 +202,7 @@ public function normalizeHeaderName($name)
 
 // ->addStylesheet()
 $t->diag('->addStylesheet()');
-$response = new myWebResponse($dispatcher);
+$response = new \myWebResponse($dispatcher);
 $response->addStylesheet('test');
 $t->ok(array_key_exists('test', $response->getStylesheets()), '->addStylesheet() adds a new stylesheet for the response');
 $response->addStylesheet('foo', '');
@@ -210,42 +211,42 @@ public function normalizeHeaderName($name)
 $t->ok(array_key_exists('first', $response->getStylesheets('first')), '->addStylesheet() takes a position as its second argument');
 $response->addStylesheet('last', 'last');
 $t->ok(array_key_exists('last', $response->getStylesheets('last')), '->addStylesheet() takes a position as its second argument');
-$response->addStylesheet('bar', '', array('media' => 'print'));
+$response->addStylesheet('bar', '', ['media' => 'print']);
 $stylesheets = $response->getStylesheets();
-$t->is($stylesheets['bar'], array('media' => 'print'), '->addStylesheet() takes an array of parameters as its third argument');
+$t->is($stylesheets['bar'], ['media' => 'print'], '->addStylesheet() takes an array of parameters as its third argument');
 
 try {
     $response->addStylesheet('last', 'none');
     $t->fail('->addStylesheet() throws an InvalidArgumentException if the position is not first, the empty string, or last');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->addStylesheet() throws an InvalidArgumentException if the position is not first, the empty string, or last');
 }
 
 // ->getStylesheets()
 $t->diag('->getStylesheets()');
-$t->is(array_keys($response->getStylesheets()), array('first', 'test', 'foo', 'bar', 'last'), '->getStylesheets() returns all current registered stylesheets ordered by position');
-$t->is($response->getStylesheets(''), array('test' => array(), 'foo' => array(), 'bar' => array('media' => 'print')), '->getStylesheets() takes a position as its first argument');
-$t->is($response->getStylesheets('first'), array('first' => array()), '->getStylesheets() takes a position as its first argument');
-$t->is($response->getStylesheets('last'), array('last' => array()), '->getStylesheets() takes a position as its first argument');
+$t->is(array_keys($response->getStylesheets()), ['first', 'test', 'foo', 'bar', 'last'], '->getStylesheets() returns all current registered stylesheets ordered by position');
+$t->is($response->getStylesheets(''), ['test' => [], 'foo' => [], 'bar' => ['media' => 'print']], '->getStylesheets() takes a position as its first argument');
+$t->is($response->getStylesheets('first'), ['first' => []], '->getStylesheets() takes a position as its first argument');
+$t->is($response->getStylesheets('last'), ['last' => []], '->getStylesheets() takes a position as its first argument');
 
 // ->removeStylesheet()
 $t->diag('->removeStylesheet()');
 $response->removeStylesheet('foo');
-$t->is(array_keys($response->getStylesheets()), array('first', 'test', 'bar', 'last'), '->removeStylesheet() removes a stylesheet from the response');
+$t->is(array_keys($response->getStylesheets()), ['first', 'test', 'bar', 'last'], '->removeStylesheet() removes a stylesheet from the response');
 $response->removeStylesheet('first');
-$t->is(array_keys($response->getStylesheets()), array('test', 'bar', 'last'), '->removeStylesheet() removes a stylesheet from the response');
+$t->is(array_keys($response->getStylesheets()), ['test', 'bar', 'last'], '->removeStylesheet() removes a stylesheet from the response');
 
 // ->clearStylesheets()
 $t->diag('->clearStylesheets()');
 $response->clearStylesheets();
-$t->is($response->getStylesheets(), array(), '->clearStylesheets() removes all stylesheets from the response');
+$t->is($response->getStylesheets(), [], '->clearStylesheets() removes all stylesheets from the response');
 
 // ->addJavascript()
 $t->diag('->addJavascript()');
-$response = new myWebResponse($dispatcher);
+$response = new \myWebResponse($dispatcher);
 $response->addJavascript('test');
 $t->ok(array_key_exists('test', $response->getJavascripts()), '->addJavascript() adds a new javascript for the response');
-$response->addJavascript('foo', '', array('raw_name' => true));
+$response->addJavascript('foo', '', ['raw_name' => true]);
 $t->ok(array_key_exists('foo', $response->getJavascripts()), '->addJavascript() adds a new javascript for the response');
 $response->addJavascript('first_js', 'first');
 $t->ok(array_key_exists('first_js', $response->getJavascripts('first')), '->addJavascript() takes a position as its second argument');
@@ -255,37 +256,37 @@ public function normalizeHeaderName($name)
 try {
     $response->addJavascript('last_js', 'none');
     $t->fail('->addJavascript() throws an InvalidArgumentException if the position is not first, the empty string, or last');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->addJavascript() throws an InvalidArgumentException if the position is not first, the empty string, or last');
 }
 
 // ->getJavascripts()
 $t->diag('->getJavascripts()');
-$t->is(array_keys($response->getJavascripts()), array('first_js', 'test', 'foo', 'last_js'), '->getJavascripts() returns all current registered javascripts ordered by position');
-$t->is($response->getJavascripts(''), array('test' => array(), 'foo' => array('raw_name' => true)), '->getJavascripts() takes a position as its first argument');
-$t->is($response->getJavascripts('first'), array('first_js' => array()), '->getJavascripts() takes a position as its first argument');
-$t->is($response->getJavascripts('last'), array('last_js' => array()), '->getJavascripts() takes a position as its first argument');
+$t->is(array_keys($response->getJavascripts()), ['first_js', 'test', 'foo', 'last_js'], '->getJavascripts() returns all current registered javascripts ordered by position');
+$t->is($response->getJavascripts(''), ['test' => [], 'foo' => ['raw_name' => true]], '->getJavascripts() takes a position as its first argument');
+$t->is($response->getJavascripts('first'), ['first_js' => []], '->getJavascripts() takes a position as its first argument');
+$t->is($response->getJavascripts('last'), ['last_js' => []], '->getJavascripts() takes a position as its first argument');
 
 // ->removeJavascript()
 $t->diag('->removeJavascript()');
 $response->removeJavascript('test');
-$t->is(array_keys($response->getJavascripts()), array('first_js', 'foo', 'last_js'), '->removeJavascripts() removes a javascript file');
+$t->is(array_keys($response->getJavascripts()), ['first_js', 'foo', 'last_js'], '->removeJavascripts() removes a javascript file');
 $response->removeJavascript('first_js');
-$t->is(array_keys($response->getJavascripts()), array('foo', 'last_js'), '->removeJavascripts() removes a javascript file');
+$t->is(array_keys($response->getJavascripts()), ['foo', 'last_js'], '->removeJavascripts() removes a javascript file');
 
 // ->clearJavascripts()
 $t->diag('->clearJavascripts()');
 $response->clearJavascripts();
-$t->is($response->clearJavascripts(), array(), '->clearJavascripts() removes all javascripts from the response');
+$t->is($response->clearJavascripts(), [], '->clearJavascripts() removes all javascripts from the response');
 
 // ->setCookie() ->getCookies()
 $t->diag('->setCookie() ->getCookies()');
 $response->setCookie('foo', 'bar');
-$t->is($response->getCookies(), array('foo' => array('name' => 'foo', 'value' => 'bar', 'expire' => null, 'path' => '/', 'domain' => '', 'secure' => false, 'httpOnly' => false)), '->setCookie() adds a cookie for the response');
+$t->is($response->getCookies(), ['foo' => ['name' => 'foo', 'value' => 'bar', 'expire' => null, 'path' => '/', 'domain' => '', 'secure' => false, 'httpOnly' => false]], '->setCookie() adds a cookie for the response');
 
 // ->setHeaderOnly() ->getHeaderOnly()
 $t->diag('->setHeaderOnly() ->isHeaderOnly()');
-$response = new myWebResponse($dispatcher);
+$response = new \myWebResponse($dispatcher);
 $t->is($response->isHeaderOnly(), false, '->isHeaderOnly() returns false if the content must be send to the client');
 $response->setHeaderOnly(true);
 $t->is($response->isHeaderOnly(), true, '->setHeaderOnly() changes the current value of header only');
diff --git a/test/unit/routing/fixtures/config_routing.yml.php b/test/unit/routing/fixtures/config_routing.yml.php
index 5efcef50d..05828f7d9 100644
--- a/test/unit/routing/fixtures/config_routing.yml.php
+++ b/test/unit/routing/fixtures/config_routing.yml.php
@@ -1,4 +1,12 @@
 <?php
 
-// auto-generated by sfRoutingConfigHandler
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 $this->routes['test1'] = 'C:7:"sfRoute":1143:{a:11:{i:0;a:2:{i:0;a:4:{i:0;s:9:"separator";i:1;s:0:"";i:2;s:1:"/";i:3;N;}i:1;a:3:{i:0;s:9:"separator";i:1;s:1:"/";i:2;s:1:"/";}}i:1;a:9:{s:18:"load_configuration";b:1;s:6:"suffix";s:0:"";s:14:"default_module";s:7:"default";s:14:"default_action";s:5:"index";s:5:"debug";s:0:"";s:7:"logging";s:0:"";s:21:"generate_shortest_url";b:1;s:32:"extra_parameters_as_query_string";b:1;s:27:"lookup_cache_dedicated_keys";b:1;}i:2;a:16:{s:6:"suffix";s:0:"";s:17:"variable_prefixes";a:1:{i:0;s:1:":";}s:18:"segment_separators";a:2:{i:0;s:1:"/";i:1;s:1:".";}s:14:"variable_regex";s:8:"[\\w\\d_]+";s:10:"text_regex";s:3:".+?";s:21:"generate_shortest_url";b:1;s:32:"extra_parameters_as_query_string";b:1;s:18:"load_configuration";b:1;s:14:"default_module";s:7:"default";s:14:"default_action";s:5:"index";s:5:"debug";s:0:"";s:7:"logging";s:0:"";s:27:"lookup_cache_dedicated_keys";b:1;s:21:"variable_prefix_regex";s:6:"(?:\\:)";s:24:"segment_separators_regex";s:8:"(?:/|\\.)";s:22:"variable_content_regex";s:7:"[^/\\.]+";}i:3;s:1:"/";i:4;s:0:"";i:5;s:6:"#^/$#x";i:6;a:0:{}i:7;a:2:{s:6:"module";s:7:"default";s:6:"action";s:5:"index";}i:8;a:0:{}i:9;s:1:"/";i:10;b:0;}}';
diff --git a/test/unit/routing/sfObjectRouteCollectionTest.php b/test/unit/routing/sfObjectRouteCollectionTest.php
index 5595f4bd3..b8dea4d05 100644
--- a/test/unit/routing/sfObjectRouteCollectionTest.php
+++ b/test/unit/routing/sfObjectRouteCollectionTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,47 +11,47 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(25);
+$t = new \lime_test(25);
 
 // ->__construct()
 $t->diag('->__construct()');
 
 try {
-    $collection = new sfObjectRouteCollection(array('name' => 'test'));
+    $collection = new \sfObjectRouteCollection(['name' => 'test']);
     $t->fail('->__construct() throws an exception if no "model" option is provided');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->__construct() throws an exception if no "model" option is provided');
 }
 
-$collection = new sfObjectRouteCollection(array('name' => 'test', 'model' => 'TestModel'));
+$collection = new \sfObjectRouteCollection(['name' => 'test', 'model' => 'TestModel']);
 $options = $collection->getOptions();
 $t->is($options['column'], 'id', '->__construct() defaults "column" option to "id"');
-$t->is_deeply($options['requirements'], array('id' => '\d+'), '->__construct() defaults "requirements" for column to "\d+"');
+$t->is_deeply($options['requirements'], ['id' => '\d+'], '->__construct() defaults "requirements" for column to "\d+"');
 
-$collection = new sfObjectRouteCollection(array('name' => 'test', 'model' => 'TestModel', 'column' => 'slug', 'default_params' => array('foo' => 'bar')));
+$collection = new \sfObjectRouteCollection(['name' => 'test', 'model' => 'TestModel', 'column' => 'slug', 'default_params' => ['foo' => 'bar']]);
 $options = $collection->getOptions();
-$t->is_deeply($options['requirements'], array('slug' => null), '->__construct() does not set a default requirement for custom columns');
-$t->is_deeply($options['default_params'], array('foo' => 'bar'), '->__construct() adds passed request parameters to the related option');
+$t->is_deeply($options['requirements'], ['slug' => null], '->__construct() does not set a default requirement for custom columns');
+$t->is_deeply($options['default_params'], ['foo' => 'bar'], '->__construct() adds passed request parameters to the related option');
 
 // with_wildcard_routes
 $t->diag('with_wildcard_routes');
 
-$collection = new sfObjectRouteCollection(array(
+$collection = new \sfObjectRouteCollection([
     'name' => 'test',
     'model' => 'TestModel',
     'with_wildcard_routes' => true,
-));
+]);
 
 $routes = $collection->getRoutes();
 $t->isa_ok($routes['test_object'], 'sfObjectRoute', '->generateRoutes() generates a wildcard object route when "with_wildcard_routes" is true');
 $t->isa_ok($routes['test_collection'], 'sfObjectRoute', '->generateRoutes() generates a wildcard collection route when "with_wildcard_routes" is true');
 
-$url = $routes['test_object']->generate(array('id' => 123, 'action' => 'export'));
-$t->isa_ok($routes['test_object']->matchesUrl($url, array('method' => 'get')), 'array', '->generateRoutes() creates a wildcard object route that matches a URL it generates');
+$url = $routes['test_object']->generate(['id' => 123, 'action' => 'export']);
+$t->isa_ok($routes['test_object']->matchesUrl($url, ['method' => 'get']), 'array', '->generateRoutes() creates a wildcard object route that matches a URL it generates');
 
 $match = null;
 foreach ($routes as $name => $route) {
-    if ($route->matchesUrl($url, array('method' => 'get'))) {
+    if ($route->matchesUrl($url, ['method' => 'get'])) {
         $match = $name;
 
         break;
@@ -58,12 +59,12 @@
 }
 $t->is($match, 'test_object', '->generateRoutes() orders routes so URLs generated by the wildcard object route are matched by that route');
 
-$url = $routes['test_collection']->generate(array('action' => 'export'));
-$t->isa_ok($routes['test_collection']->matchesUrl($url, array('method' => 'post')), 'array', '->generateRoutes() creates a wildcard collection route that matches a URL it generates');
+$url = $routes['test_collection']->generate(['action' => 'export']);
+$t->isa_ok($routes['test_collection']->matchesUrl($url, ['method' => 'post']), 'array', '->generateRoutes() creates a wildcard collection route that matches a URL it generates');
 
 $match = null;
 foreach ($routes as $name => $route) {
-    if ($route->matchesUrl($url, array('method' => 'post'))) {
+    if ($route->matchesUrl($url, ['method' => 'post'])) {
         $match = $name;
 
         break;
@@ -74,23 +75,23 @@
 // collection_actions
 $t->diag('collection_actions');
 
-$collection = new sfObjectRouteCollection(array(
+$collection = new \sfObjectRouteCollection([
     'name' => 'test',
     'model' => 'TestModel',
     'with_wildcard_routes' => true,
-    'collection_actions' => array('export' => array('post')),
-    'default_params' => array('foo' => 'bar'),
-));
+    'collection_actions' => ['export' => ['post']],
+    'default_params' => ['foo' => 'bar'],
+]);
 
 $routes = $collection->getRoutes();
 $t->isa_ok($routes['test_export'], 'sfObjectRoute', '->generateRoutes() generates custom collection routes');
 
-$url = $routes['test_export']->generate(array());
-$t->isa_ok($routes['test_export']->matchesUrl($url, array('method' => 'post')), 'array', '->generateRoutes() creates a collection action route that matches a URL it generates');
+$url = $routes['test_export']->generate([]);
+$t->isa_ok($routes['test_export']->matchesUrl($url, ['method' => 'post']), 'array', '->generateRoutes() creates a collection action route that matches a URL it generates');
 
 $match = null;
 foreach ($routes as $name => $route) {
-    if ($route->matchesUrl($url, array('method' => 'post'))) {
+    if ($route->matchesUrl($url, ['method' => 'post'])) {
         $match = $name;
 
         break;
@@ -98,10 +99,10 @@
 }
 $t->is($match, 'test_export', '->generateRoutes() orders routes so URLs generated by the collection action route are matched by that route');
 
-$url = $routes['test_collection']->generate(array('action' => 'export'));
+$url = $routes['test_collection']->generate(['action' => 'export']);
 $match = null;
 foreach ($routes as $name => $route) {
-    if ($route->matchesUrl($url, array('method' => 'post'))) {
+    if ($route->matchesUrl($url, ['method' => 'post'])) {
         $match = $name;
 
         break;
diff --git a/test/unit/routing/sfObjectRouteTest.php b/test/unit/routing/sfObjectRouteTest.php
index c4673b12e..36f72e44b 100644
--- a/test/unit/routing/sfObjectRouteTest.php
+++ b/test/unit/routing/sfObjectRouteTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 class Foo
 {
@@ -21,11 +22,11 @@ public function getid()
 }
 
 // simulate Doctrine route
-class ObjectRoute extends sfObjectRoute
+class ObjectRoute extends \sfObjectRoute
 {
     protected function doConvertObjectToArray($object)
     {
-        $parameters = array();
+        $parameters = [];
         foreach ($this->getRealVariables() as $variable) {
             if (method_exists($object, $method = 'get'.$variable)) {
                 $parameters[$variable] = $object->{$method}();
@@ -38,5 +39,5 @@ protected function doConvertObjectToArray($object)
 
 // ->generate()
 $t->diag('->generate()');
-$route = new ObjectRoute('/:id', array(), array(), array('model' => 'Foo', 'type' => 'object'));
-$t->is($route->generate(array('sf_subject' => new Foo())), '/1', '->generate() generates a URL with the given parameters');
+$route = new \ObjectRoute('/:id', [], [], ['model' => 'Foo', 'type' => 'object']);
+$t->is($route->generate(['sf_subject' => new \Foo()]), '/1', '->generate() generates a URL with the given parameters');
diff --git a/test/unit/routing/sfPatternRoutingTest.php b/test/unit/routing/sfPatternRoutingTest.php
index da07786f7..b020e7f8f 100644
--- a/test/unit/routing/sfPatternRoutingTest.php
+++ b/test/unit/routing/sfPatternRoutingTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,16 +11,16 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(149);
+$t = new \lime_test(149);
 
 /**
  * @internal
  *
  * @coversNothing
  */
-class sfPatternRoutingTest extends sfPatternRouting
+class sfPatternRoutingTest extends \sfPatternRouting
 {
-    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function initialize(\sfEventDispatcher $dispatcher, \sfCache $cache = null, $options = [])
     {
         parent::initialize($dispatcher, $cache, $options);
 
@@ -50,9 +51,9 @@ protected function getConfigFileName()
     }
 }
 
-class sfAlwaysAbsoluteRoute extends sfRoute
+class sfAlwaysAbsoluteRoute extends \sfRoute
 {
-    public function generate($params, $context = array(), $absolute = false)
+    public function generate($params, $context = [], $absolute = false)
     {
         $url = parent::generate($params, $context, $absolute);
 
@@ -60,15 +61,15 @@ public function generate($params, $context = array(), $absolute = false)
     }
 }
 
-$options = array('generate_shortest_url' => false, 'extra_parameters_as_query_string' => false);
+$options = ['generate_shortest_url' => false, 'extra_parameters_as_query_string' => false];
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, $options);
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, $options);
 
 // ->getRoutes()
 $t->diag('->getRoutes()');
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:module/:action'));
-$r->connect('test2', new sfRoute('/home'));
+$r->connect('test1', new \sfRoute('/:module/:action'));
+$r->connect('test2', new \sfRoute('/home'));
 $routes = $r->getRoutes();
 $t->is(count($routes), 2, '->getRoutes() returns all current routes');
 $t->ok(isset($routes['test1']), '->getRoutes() returns a hash indexed by route names');
@@ -77,8 +78,8 @@ public function generate($params, $context = array(), $absolute = false)
 // ->setRoutes()
 $t->diag('->setRoutes()');
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:module/:action'));
-$r->connect('test2', new sfRoute('/home'));
+$r->connect('test1', new \sfRoute('/:module/:action'));
+$r->connect('test2', new \sfRoute('/home'));
 $routes = $r->getRoutes();
 $r->clearRoutes();
 $r->setRoutes($routes);
@@ -87,7 +88,7 @@ public function generate($params, $context = array(), $absolute = false)
 // ->clearRoutes()
 $t->diag('->clearRoutes()');
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:module/:action'));
+$r->connect('test1', new \sfRoute('/:module/:action'));
 $r->clearRoutes();
 $routes = $r->getRoutes();
 $t->is(count($routes), 0, '->clearRoutes() clears all current routing rules');
@@ -96,14 +97,14 @@ public function generate($params, $context = array(), $absolute = false)
 $t->diag('->hasRoutes()');
 $r->clearRoutes();
 $t->is($r->hasRoutes(), false, '->hasRoutes() returns false if there is no route');
-$r->connect('test1', new sfRoute('/:module/:action'));
+$r->connect('test1', new \sfRoute('/:module/:action'));
 $t->is($r->hasRoutes(), true, '->hasRoutes() returns true if some routes are registered');
 
 // ->connect()
 $t->diag('->connect()');
 $r->clearRoutes();
-$r->connect('test', new sfRoute(':module/:action', array('module' => 'default', 'action' => 'index')));
-$r->connect('test1', new sfRoute('', array('module' => 'default', 'action' => 'index')));
+$r->connect('test', new \sfRoute(':module/:action', ['module' => 'default', 'action' => 'index']));
+$r->connect('test1', new \sfRoute('', ['module' => 'default', 'action' => 'index']));
 
 $routes = $r->getRoutes();
 
@@ -115,12 +116,12 @@ public function generate($params, $context = array(), $absolute = false)
 
 // simple routes
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:module/:action', array('module' => 'default', 'action' => 'index1')));
-$r->connect('test2', new sfRoute('/foo/bar', array('module' => 'default', 'action' => 'index2')));
-$r->connect('test3', new sfRoute('/foo/:module/bar/:action', array('module' => 'default', 'action' => 'index3')));
-$r->connect('test4', new sfRoute('/nodefault/:module/:action'));
+$r->connect('test1', new \sfRoute('/:module/:action', ['module' => 'default', 'action' => 'index1']));
+$r->connect('test2', new \sfRoute('/foo/bar', ['module' => 'default', 'action' => 'index2']));
+$r->connect('test3', new \sfRoute('/foo/:module/bar/:action', ['module' => 'default', 'action' => 'index3']));
+$r->connect('test4', new \sfRoute('/nodefault/:module/:action'));
 
-$params = array('module' => 'default', 'action' => 'index1');
+$params = ['module' => 'default', 'action' => 'index1'];
 $url = '/default/index1';
 $t->is($r->parse($url), $params, '->parse() /:module/:action route');
 $t->is($r->generate('', $params), $url, '->generate() /:module/:action url');
@@ -128,22 +129,22 @@ public function generate($params, $context = array(), $absolute = false)
 // order
 $t->diag('route order');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test/:id', array('module' => 'default1', 'action' => 'index1'), array('id' => '\d+')));
-$r->connect('test1', new sfRoute('/test/:id', array('module' => 'default2', 'action' => 'index2')));
-$params = array('module' => 'default1', 'action' => 'index1', 'id' => '12');
+$r->connect('test', new \sfRoute('/test/:id', ['module' => 'default1', 'action' => 'index1'], ['id' => '\d+']));
+$r->connect('test1', new \sfRoute('/test/:id', ['module' => 'default2', 'action' => 'index2']));
+$params = ['module' => 'default1', 'action' => 'index1', 'id' => '12'];
 $url = '/test/12';
 $t->is($r->parse($url), $params, '->parse() takes the first matching route');
 $t->is($r->generate('', $params), $url, '->generate() takes the first matching route');
 
-$params = array('module' => 'default2', 'action' => 'index2', 'id' => 'foo');
+$params = ['module' => 'default2', 'action' => 'index2', 'id' => 'foo'];
 $url = '/test/foo';
 $t->is($r->parse($url), $params, '->parse() takes the first matching route');
 $t->is($r->generate('', $params), $url, '->generate() takes the first matching route');
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/test/:id/:test', array('module' => 'default', 'action' => 'index')));
-$r->connect('test1', new sfRoute('/:module/:action/test/:id', array('module' => 'default', 'action' => 'index', 'id' => 'foo')));
-$params = array('module' => 'default', 'action' => 'index', 'id' => 'foo');
+$r->connect('test', new \sfRoute('/:module/:action/test/:id/:test', ['module' => 'default', 'action' => 'index']));
+$r->connect('test1', new \sfRoute('/:module/:action/test/:id', ['module' => 'default', 'action' => 'index', 'id' => 'foo']));
+$params = ['module' => 'default', 'action' => 'index', 'id' => 'foo'];
 $url = '/default/index/test/foo';
 $t->is($r->parse($url), $params, '->parse() takes the first matching route');
 $t->is($r->generate('', $params), $url, '->generate() takes the first matching route');
@@ -151,97 +152,97 @@ public function generate($params, $context = array(), $absolute = false)
 // suffix
 $t->diag('suffix');
 $r->clearRoutes();
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array_merge($options, array('suffix' => '.html')));
-$r->connect('foo0', new sfRoute('/foo0/:module/:action/:param0', array('module' => 'default', 'action' => 'index0')));
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, array_merge($options, ['suffix' => '.html']));
+$r->connect('foo0', new \sfRoute('/foo0/:module/:action/:param0', ['module' => 'default', 'action' => 'index0']));
 $url0 = '/foo0/default/index0/foo0.html';
-$r->connect('foo1', new sfRoute('/foo1/:module/:action/:param1.', array('module' => 'default', 'action' => 'index1')));
+$r->connect('foo1', new \sfRoute('/foo1/:module/:action/:param1.', ['module' => 'default', 'action' => 'index1']));
 $url1 = '/foo1/default/index1/foo1';
-$r->connect('foo2', new sfRoute('/foo2/:module/:action/:param2/', array('module' => 'default', 'action' => 'index2')));
+$r->connect('foo2', new \sfRoute('/foo2/:module/:action/:param2/', ['module' => 'default', 'action' => 'index2']));
 $url2 = '/foo2/default/index2/foo2/';
-$r->connect('foo3', new sfRoute('/foo3/:module/:action/:param3.foo', array('module' => 'default', 'action' => 'index3')));
+$r->connect('foo3', new \sfRoute('/foo3/:module/:action/:param3.foo', ['module' => 'default', 'action' => 'index3']));
 $url3 = '/foo3/default/index3/foo3.foo';
-$r->connect('foo4', new sfRoute('/foo4/:module/:action/:param4.:param_5', array('module' => 'default', 'action' => 'index4')));
+$r->connect('foo4', new \sfRoute('/foo4/:module/:action/:param4.:param_5', ['module' => 'default', 'action' => 'index4']));
 $url4 = '/foo4/default/index4/foo.bar';
 
-$t->is($r->generate('', array('module' => 'default', 'action' => 'index0', 'param0' => 'foo0')), $url0, '->generate() creates URL suffixed by "sf_suffix" parameter');
-$t->is($r->generate('', array('module' => 'default', 'action' => 'index1', 'param1' => 'foo1')), $url1, '->generate() creates URL with no suffix when route ends with .');
-$t->is($r->generate('', array('module' => 'default', 'action' => 'index2', 'param2' => 'foo2')), $url2, '->generate() creates URL with no suffix when route ends with /');
-$t->is($r->generate('', array('module' => 'default', 'action' => 'index3', 'param3' => 'foo3')), $url3, '->generate() creates URL with special suffix when route ends with .suffix');
-$t->is($r->generate('', array('module' => 'default', 'action' => 'index4', 'param4' => 'foo', 'param_5' => 'bar')), $url4, '->generate() creates URL with no special suffix when route ends with .:suffix');
+$t->is($r->generate('', ['module' => 'default', 'action' => 'index0', 'param0' => 'foo0']), $url0, '->generate() creates URL suffixed by "sf_suffix" parameter');
+$t->is($r->generate('', ['module' => 'default', 'action' => 'index1', 'param1' => 'foo1']), $url1, '->generate() creates URL with no suffix when route ends with .');
+$t->is($r->generate('', ['module' => 'default', 'action' => 'index2', 'param2' => 'foo2']), $url2, '->generate() creates URL with no suffix when route ends with /');
+$t->is($r->generate('', ['module' => 'default', 'action' => 'index3', 'param3' => 'foo3']), $url3, '->generate() creates URL with special suffix when route ends with .suffix');
+$t->is($r->generate('', ['module' => 'default', 'action' => 'index4', 'param4' => 'foo', 'param_5' => 'bar']), $url4, '->generate() creates URL with no special suffix when route ends with .:suffix');
 
-$t->is($r->parse($url0), array('module' => 'default', 'action' => 'index0', 'param0' => 'foo0'), '->parse() finds route from URL suffixed by "sf_suffix"');
-$t->is($r->parse($url1), array('module' => 'default', 'action' => 'index1', 'param1' => 'foo1'), '->parse() finds route with no suffix when route ends with .');
-$t->is($r->parse($url2), array('module' => 'default', 'action' => 'index2', 'param2' => 'foo2'), '->parse() finds route with no suffix when route ends with /');
-$t->is($r->parse($url3), array('module' => 'default', 'action' => 'index3', 'param3' => 'foo3'), '->parse() finds route with special suffix when route ends with .suffix');
-$t->is($r->parse($url4), array('module' => 'default', 'action' => 'index4', 'param4' => 'foo', 'param_5' => 'bar'), '->parse() finds route with special suffix when route ends with .:suffix');
+$t->is($r->parse($url0), ['module' => 'default', 'action' => 'index0', 'param0' => 'foo0'], '->parse() finds route from URL suffixed by "sf_suffix"');
+$t->is($r->parse($url1), ['module' => 'default', 'action' => 'index1', 'param1' => 'foo1'], '->parse() finds route with no suffix when route ends with .');
+$t->is($r->parse($url2), ['module' => 'default', 'action' => 'index2', 'param2' => 'foo2'], '->parse() finds route with no suffix when route ends with /');
+$t->is($r->parse($url3), ['module' => 'default', 'action' => 'index3', 'param3' => 'foo3'], '->parse() finds route with special suffix when route ends with .suffix');
+$t->is($r->parse($url4), ['module' => 'default', 'action' => 'index4', 'param4' => 'foo', 'param_5' => 'bar'], '->parse() finds route with special suffix when route ends with .:suffix');
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, $options);
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, $options);
 
 // query string
 $t->diag('query string');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/index.php/:module/:action', array('module' => 'default', 'action' => 'index')));
-$params = array('module' => 'default', 'action' => 'index');
+$r->connect('test', new \sfRoute('/index.php/:module/:action', ['module' => 'default', 'action' => 'index']));
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/index.php/default/index?test=1&toto=2';
 $t->is($r->parse($url), $params, '->parse() does not take query string into account');
 
 // default values
 $t->diag('default values');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action', array('module' => 'default', 'action' => 'index')));
+$r->connect('test', new \sfRoute('/:module/:action', ['module' => 'default', 'action' => 'index']));
 $t->is(
-    $r->generate('', array('module' => 'default')),
+    $r->generate('', ['module' => 'default']),
     '/default/index',
     '->generate() creates URL for route with missing parameter if parameter is set in the default values'
 );
 $t->is(
     $r->parse('/default'),
-    array('module' => 'default', 'action' => 'index'),
+    ['module' => 'default', 'action' => 'index'],
     '->parse() finds route for URL   with missing parameter if parameter is set in the default values'
 );
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/:foo', array('module' => 'default', 'action' => 'index', 'foo' => 'bar')));
+$r->connect('test', new \sfRoute('/:module/:action/:foo', ['module' => 'default', 'action' => 'index', 'foo' => 'bar']));
 $t->is(
-    $r->generate('', array('module' => 'default')),
+    $r->generate('', ['module' => 'default']),
     '/default/index/bar',
     '->generate() creates URL for route with more than one missing parameter if default values are set'
 );
 $t->is(
     $r->parse('/default'),
-    array('module' => 'default', 'action' => 'index', 'foo' => 'bar'),
+    ['module' => 'default', 'action' => 'index', 'foo' => 'bar'],
     '->parse() finds route for URL   with more than one missing parameter if default values are set'
 );
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action', array('module' => 'default', 'action' => 'index')));
-$params = array('module' => 'foo', 'action' => 'bar');
+$r->connect('test', new \sfRoute('/:module/:action', ['module' => 'default', 'action' => 'index']));
+$params = ['module' => 'foo', 'action' => 'bar'];
 $url = '/foo/bar';
 $t->is($r->generate('', $params), $url, '->generate() parameters override the route default values');
 $t->is($r->parse($url), $params, '->parse() finds route with parameters distinct from the default values');
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action', array('module' => 'default')));
-$params = array('module' => 'default', 'action' => 'index');
+$r->connect('test', new \sfRoute('/:module/:action', ['module' => 'default']));
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/default/index';
 $t->is($r->generate('', $params), $url, '->generate() creates URL even if there is no default value');
 $t->is($r->parse($url), $params, '->parse() finds route even when route has no default value');
 
 // combined examples
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/:test/:id', array('module' => 'default', 'action' => 'index', 'id' => 'toto')));
-$params = array('module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'bar');
+$r->connect('test', new \sfRoute('/:module/:action/:test/:id', ['module' => 'default', 'action' => 'index', 'id' => 'toto']));
+$params = ['module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'bar'];
 $url = '/default/index/foo/bar';
 $t->is($r->generate('', $params), $url, '->generate() routes have default parameters value that can be overriden');
 $t->is($r->parse($url), $params, '->parse() routes have default parameters value that can be overriden');
-$params = array('module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'toto');
+$params = ['module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'toto'];
 $url = '/default/index/foo';
 $t->isnt($r->generate('', $params), $url, '->generate() does not remove the last parameter if the parameter is default value');
 $t->is($r->parse($url), $params, '->parse() removes the last parameter if the parameter is default value');
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/:test/:id', array('module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'bar')));
-$params = array('module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'bar');
+$r->connect('test', new \sfRoute('/:module/:action/:test/:id', ['module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'bar']));
+$params = ['module' => 'default', 'action' => 'index', 'test' => 'foo', 'id' => 'bar'];
 $url = '/default/index';
 $t->isnt($r->generate('', $params), $url, '->generate() does not remove last parameters if they have default values');
 $t->is($r->parse($url), $params, '->parse() removes last parameters if they have default values');
@@ -249,17 +250,17 @@ public function generate($params, $context = array(), $absolute = false)
 // routing defaults parameters
 $r->setDefaultParameter('foo', 'bar');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test/:foo/:id', array('module' => 'default', 'action' => 'index')));
-$params = array('module' => 'default', 'action' => 'index', 'id' => 12);
+$r->connect('test', new \sfRoute('/test/:foo/:id', ['module' => 'default', 'action' => 'index']));
+$params = ['module' => 'default', 'action' => 'index', 'id' => 12];
 $url = '/test/bar/12';
 $t->is($r->generate('', $params), $url, '->generate() merges parameters with defaults from "sf_routing_defaults"');
-$r->setDefaultParameters(array());
+$r->setDefaultParameters([]);
 
 // unnamed wildcard *
 $t->diag('unnamed wildcard *');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/test/*', array('module' => 'default', 'action' => 'index')));
-$params = array('module' => 'default', 'action' => 'index');
+$r->connect('test', new \sfRoute('/:module/:action/test/*', ['module' => 'default', 'action' => 'index']));
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/default/index/test';
 $t->is($r->parse($url), $params, '->parse() finds route for URL   with no additional parameters when route ends with unnamed wildcard *');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route with no additional parameters when route ends with unnamed wildcard *');
@@ -267,11 +268,11 @@ public function generate($params, $context = array(), $absolute = false)
 // #4173
 $url = '/default/index/test/';
 $t->is($r->parse($url), $params, '->parse() finds route for URL   with no additional parameters and trailing slash when route ends with unnamed wildcard *');
-$params = array('module' => 'default', 'action' => 'index', 'titi' => 'toto');
+$params = ['module' => 'default', 'action' => 'index', 'titi' => 'toto'];
 $url = '/default/index/test/titi/toto/';
 $t->is($r->parse($url), $params, '->parse() finds route for URL   with additional parameters and trailing slash when route ends with unnamed wildcard *');
 
-$params = array('module' => 'default', 'action' => 'index', 'page' => '4.html', 'toto' => true, 'titi' => 'toto', 'OK' => true);
+$params = ['module' => 'default', 'action' => 'index', 'page' => '4.html', 'toto' => true, 'titi' => 'toto', 'OK' => true];
 $url = '/default/index/test/page/4.html/toto/1/titi/toto/OK/1';
 $t->is($r->parse($url), $params, '->parse() finds route for URL   with additional parameters when route ends with unnamed wildcard *');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route with additional parameters when route ends with unnamed wildcard *');
@@ -280,13 +281,13 @@ public function generate($params, $context = array(), $absolute = false)
 
 // unnamed wildcard * after a token
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module', array('action' => 'index')));
-$r->connect('test1', new sfRoute('/:module/:action/*', array()));
-$params = array('module' => 'default', 'action' => 'index', 'toto' => 'titi');
+$r->connect('test', new \sfRoute('/:module', ['action' => 'index']));
+$r->connect('test1', new \sfRoute('/:module/:action/*', []));
+$params = ['module' => 'default', 'action' => 'index', 'toto' => 'titi'];
 $url = '/default/index/toto/titi';
 $t->is($r->parse($url), $params, '->parse() takes the first matching route but takes * into accounts');
 $t->is($r->generate('', $params), $url, '->generate() takes the first matching route but takes * into accounts');
-$params = array('module' => 'default', 'action' => 'index');
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/default';
 $t->is($r->parse($url), $params, '->parse() takes the first matching route but takes * into accounts');
 $t->is($r->generate('', $params), $url, '->generate() takes the first matching route but takes * into accounts');
@@ -294,28 +295,28 @@ public function generate($params, $context = array(), $absolute = false)
 // unnamed wildcard * in the middle of a rule
 $t->diag('unnamed wildcard * in the middle of a rule');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/*/test', array('module' => 'default', 'action' => 'index')));
+$r->connect('test', new \sfRoute('/:module/:action/*/test', ['module' => 'default', 'action' => 'index']));
 
-$params = array('module' => 'default', 'action' => 'index');
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/default/index/test';
 $t->is($r->parse($url), $params, '->parse() finds route for URL when no extra parameters are present in the URL');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route when no extra parameters are added to the internal URI');
 
-$params = array('module' => 'default', 'action' => 'index', 'foo' => true, 'bar' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'foo' => true, 'bar' => 'foobar'];
 $url = '/default/index/foo/1/bar/foobar/test';
 $t->is($r->parse($url), $params, '->parse() finds route for URL when extra parameters are present in the URL');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route when extra parameters are added to the internal URI');
 
 // unnamed wildcard * in the middle of a rule, with a separator after distinct from /
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/*.test', array('module' => 'default', 'action' => 'index')));
+$r->connect('test', new \sfRoute('/:module/:action/*.test', ['module' => 'default', 'action' => 'index']));
 
-$params = array('module' => 'default', 'action' => 'index');
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/default/index.test';
 $t->is($r->parse($url), $params, '->parse() finds route for URL when no extra parameters are present in the URL');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route when no extra parameters are added to the internal URI');
 
-$params = array('module' => 'default', 'action' => 'index', 'foo' => true, 'bar' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'foo' => true, 'bar' => 'foobar'];
 $url = '/default/index/foo/1/bar/foobar.test';
 $t->is($r->parse($url), $params, '->parse() finds route for URL when extra parameters are present in the URL');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route when extra parameters are added to the internal URI');
@@ -323,99 +324,99 @@ public function generate($params, $context = array(), $absolute = false)
 // requirements
 $t->diag('requirements');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/id/:id', array('module' => 'default', 'action' => 'integer'), array('id' => '\d+')));
-$r->connect('test1', new sfRoute('/:module/:action/:id', array('module' => 'default', 'action' => 'string')));
+$r->connect('test', new \sfRoute('/:module/:action/id/:id', ['module' => 'default', 'action' => 'integer'], ['id' => '\d+']));
+$r->connect('test1', new \sfRoute('/:module/:action/:id', ['module' => 'default', 'action' => 'string']));
 
-$params = array('module' => 'default', 'action' => 'integer', 'id' => 12);
+$params = ['module' => 'default', 'action' => 'integer', 'id' => 12];
 $url = '/default/integer/id/12';
 $t->is($r->parse($url), $params, '->parse() finds route for URL   when parameters meet requirements');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route when parameters meet requirements');
 
-$params = array('module' => 'default', 'action' => 'string', 'id' => 'NOTANINTEGER');
+$params = ['module' => 'default', 'action' => 'string', 'id' => 'NOTANINTEGER'];
 $url = '/default/string/NOTANINTEGER';
 $t->is($r->parse($url), $params, '->parse() ignore routes when parameters don\'t meet requirements');
 $t->is($r->generate('', $params), $url, '->generate() ignore routes when parameters don\'t meet requirements');
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module/:action/id/:id', array('module' => 'default', 'action' => 'integer'), array('id' => '[^/]{2}')));
+$r->connect('test', new \sfRoute('/:module/:action/id/:id', ['module' => 'default', 'action' => 'integer'], ['id' => '[^/]{2}']));
 
-$params = array('module' => 'default', 'action' => 'integer', 'id' => 'a1');
+$params = ['module' => 'default', 'action' => 'integer', 'id' => 'a1'];
 $url = '/default/integer/id/a1';
 $t->is($r->parse($url), $params, '->parse() finds route for URL   when parameters meet requirements');
 $t->is($r->generate('', $params), $url, '->generate() creates URL for route when parameters meet requirements');
 
 // separators
 $t->diag('separators');
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array_merge($options, array('segment_separators' => array('/', ';', ':', '|', '.', '-', '+'))));
-$r->connect('test', new sfRoute('/:module/:action;:foo::baz+static+:toto|:hip-:zozo.:format', array()));
-$r->connect('test0', new sfRoute('/:module/:action0', array()));
-$r->connect('test1', new sfRoute('/:module;:action1', array()));
-$r->connect('test2', new sfRoute('/:module::action2', array()));
-$r->connect('test3', new sfRoute('/:module+:action3', array()));
-$r->connect('test4', new sfRoute('/:module|:action4', array()));
-$r->connect('test5', new sfRoute('/:module.:action5', array()));
-$r->connect('test6', new sfRoute('/:module-:action6', array()));
-$params = array('module' => 'default', 'action' => 'index', 'action0' => 'foobar');
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, array_merge($options, ['segment_separators' => ['/', ';', ':', '|', '.', '-', '+']]));
+$r->connect('test', new \sfRoute('/:module/:action;:foo::baz+static+:toto|:hip-:zozo.:format', []));
+$r->connect('test0', new \sfRoute('/:module/:action0', []));
+$r->connect('test1', new \sfRoute('/:module;:action1', []));
+$r->connect('test2', new \sfRoute('/:module::action2', []));
+$r->connect('test3', new \sfRoute('/:module+:action3', []));
+$r->connect('test4', new \sfRoute('/:module|:action4', []));
+$r->connect('test5', new \sfRoute('/:module.:action5', []));
+$r->connect('test6', new \sfRoute('/:module-:action6', []));
+$params = ['module' => 'default', 'action' => 'index', 'action0' => 'foobar'];
 $url = '/default/foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by /');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with / separator');
-$params = array('module' => 'default', 'action' => 'index', 'action1' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'action1' => 'foobar'];
 $url = '/default;foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by ;');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with ; separator');
-$params = array('module' => 'default', 'action' => 'index', 'action2' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'action2' => 'foobar'];
 $url = '/default:foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by :');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with : separator');
-$params = array('module' => 'default', 'action' => 'index', 'action3' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'action3' => 'foobar'];
 $url = '/default+foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by +');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with + separator');
-$params = array('module' => 'default', 'action' => 'index', 'action4' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'action4' => 'foobar'];
 $url = '/default|foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by |');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with | separator');
-$params = array('module' => 'default', 'action' => 'index', 'action5' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'action5' => 'foobar'];
 $url = '/default.foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by .');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with . separator');
-$params = array('module' => 'default', 'action' => 'index', 'action' => 'index', 'action6' => 'foobar');
+$params = ['module' => 'default', 'action' => 'index', 'action' => 'index', 'action6' => 'foobar'];
 $url = '/default-foobar';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by -');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with - separator');
-$params = array('module' => 'default', 'action' => 'index', 'action' => 'foobar', 'foo' => 'bar', 'baz' => 'baz', 'toto' => 'titi', 'hip' => 'hop', 'zozo' => 'zaza', 'format' => 'xml');
+$params = ['module' => 'default', 'action' => 'index', 'action' => 'foobar', 'foo' => 'bar', 'baz' => 'baz', 'toto' => 'titi', 'hip' => 'hop', 'zozo' => 'zaza', 'format' => 'xml'];
 $url = '/default/foobar;bar:baz+static+titi|hop-zaza.xml';
 $t->is($r->parse($url), $params, '->parse() recognizes parameters separated by mixed separators');
 $t->is($r->generate('', $params), $url, '->generate() creates routes with mixed separators');
 
 // see ticket #8114
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array_merge($options, array('segment_separators' => array())));
-$r->connect('nosegment', new sfRoute('/:nonsegmented', array()));
-$params = array('module' => 'default', 'action' => 'index', 'nonsegmented' => 'plainurl');
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, array_merge($options, ['segment_separators' => []]));
+$r->connect('nosegment', new \sfRoute('/:nonsegmented', []));
+$params = ['module' => 'default', 'action' => 'index', 'nonsegmented' => 'plainurl'];
 $url = '/plainurl';
 $t->is($r->parse($url), $params, '->parse() works without segment_separators');
 $t->is($r->generate('', $params), $url, '->generate() works without segment_separators');
-$params = array('module' => 'default', 'action' => 'index', 'nonsegmented' => 'foo/bar/baz');
+$params = ['module' => 'default', 'action' => 'index', 'nonsegmented' => 'foo/bar/baz'];
 $t->is($r->parse('/foo/bar/baz'), $params, '->parse() works without segment_separators');
 $t->is($r->generate('', $params), '/foo%2Fbar%2Fbaz', '->generate() works without segment_separators');
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array_merge($options, array('segment_separators' => array('~'))));
-$r->connect('nosegment', new sfRoute('/:nonsegmented', array()));
-$params = array('module' => 'default', 'action' => 'index', 'nonsegmented' => 'plainurl');
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, array_merge($options, ['segment_separators' => ['~']]));
+$r->connect('nosegment', new \sfRoute('/:nonsegmented', []));
+$params = ['module' => 'default', 'action' => 'index', 'nonsegmented' => 'plainurl'];
 $url = '/plainurl';
 $t->is($r->parse($url), $params, '->parse() works with segment_separators which are not in url');
 $t->is($r->generate('', $params), $url, '->generate() works with segment_separators which are not in url');
-$params = array('module' => 'default', 'action' => 'index', 'nonsegmented' => 'foo/bar/baz');
+$params = ['module' => 'default', 'action' => 'index', 'nonsegmented' => 'foo/bar/baz'];
 $t->is($r->parse('/foo/bar/baz'), $params, '->parse() works with segment_separators which are not in url');
 $t->is($r->generate('', $params), '/foo%2Fbar%2Fbaz', '->generate() works with segment_separators which are not in url');
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array_merge($options, array('variable_prefixes' => array(':', '$'))));
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, array_merge($options, ['variable_prefixes' => [':', '$']]));
 
 // token names
 $t->diag('token names');
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:foo_1/:bar2', array()));
-$params = array('module' => 'default', 'action' => 'index', 'foo_1' => 'test', 'bar2' => 'foobar');
+$r->connect('test1', new \sfRoute('/:foo_1/:bar2', []));
+$params = ['module' => 'default', 'action' => 'index', 'foo_1' => 'test', 'bar2' => 'foobar'];
 $url = '/test/foobar';
 $t->is($r->parse($url), $params, '->parse() accepts token names composed of letters, digits and _');
 $t->is($r->generate('', $params), $url, '->generate() accepts token names composed of letters, digits and _');
@@ -423,18 +424,18 @@ public function generate($params, $context = array(), $absolute = false)
 // token prefix
 $t->diag('token prefix');
 $r->clearRoutes();
-$r->connect('test2', new sfRoute('/2/$module/$action/$id', array()));
-$r->connect('test3', new sfRoute('/3/$module/:action/$first_name/:last_name', array()));
-$r->connect('test1', new sfRoute('/1/:module/:action', array()));
-$params1 = array('module' => 'foo', 'action' => 'bar');
+$r->connect('test2', new \sfRoute('/2/$module/$action/$id', []));
+$r->connect('test3', new \sfRoute('/3/$module/:action/$first_name/:last_name', []));
+$r->connect('test1', new \sfRoute('/1/:module/:action', []));
+$params1 = ['module' => 'foo', 'action' => 'bar'];
 $url1 = '/1/foo/bar';
 $t->is($r->parse($url1), $params1, '->parse() accepts token names starting with :');
 $t->is($r->generate('', $params1), $url1, '->generate() accepts token names starting with :');
-$params2 = array('module' => 'foo', 'action' => 'bar', 'id' => 12);
+$params2 = ['module' => 'foo', 'action' => 'bar', 'id' => 12];
 $url2 = '/2/foo/bar/12';
 $t->is($r->parse($url2), $params2, '->parse() accepts token names starting with $');
 $t->is($r->generate('', $params2), $url2, '->generate() accepts token names starting with $');
-$params3 = array('module' => 'foo', 'action' => 'bar', 'first_name' => 'John', 'last_name' => 'Doe');
+$params3 = ['module' => 'foo', 'action' => 'bar', 'first_name' => 'John', 'last_name' => 'Doe'];
 $url3 = '/3/foo/bar/John/Doe';
 $t->is($r->parse($url3), $params3, '->parse() accepts token names starting with mixed : and $');
 $t->is($r->generate('', $params3), $url3, '->generate() accepts token names starting with mixed : and $');
@@ -442,10 +443,10 @@ public function generate($params, $context = array(), $absolute = false)
 // named routes
 $t->diag('named routes');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test/:id', array('module' => 'default', 'action' => 'integer'), array('id' => '\d+')));
-$params = array('module' => 'default', 'action' => 'integer', 'id' => 12);
+$r->connect('test', new \sfRoute('/test/:id', ['module' => 'default', 'action' => 'integer'], ['id' => '\d+']));
+$params = ['module' => 'default', 'action' => 'integer', 'id' => 12];
 $url = '/test/12';
-$named_params = array('id' => 12);
+$named_params = ['id' => 12];
 $t->is($r->generate('', $params), $url, '->generate() can take an empty route name as its first parameter');
 $t->is($r->generate('test', $params), $url, '->generate() can take a route name as its first parameter');
 $t->is($r->generate('test', $named_params), $url, '->generate() with named routes needs only parameters not defined in route default');
@@ -453,56 +454,56 @@ public function generate($params, $context = array(), $absolute = false)
 // ->appendRoute()
 $t->diag('->appendRoute()');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module', array('action' => 'index')));
-$r->connect('test1', new sfRoute('/:module/:action/*', array()));
+$r->connect('test', new \sfRoute('/:module', ['action' => 'index']));
+$r->connect('test1', new \sfRoute('/:module/:action/*', []));
 $routes = $r->getRoutes();
 $r->clearRoutes();
-$r->appendRoute('test', new sfRoute('/:module', array('action' => 'index')));
-$r->appendRoute('test1', new sfRoute('/:module/:action/*', array()));
+$r->appendRoute('test', new \sfRoute('/:module', ['action' => 'index']));
+$r->appendRoute('test1', new \sfRoute('/:module/:action/*', []));
 $t->is($r->getRoutes(), $routes, '->appendRoute() is an alias for ->connect()');
 
 // ->prependRoute()
 $t->diag('->prependRoute()');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/:module', array('action' => 'index')));
-$r->connect('test1', new sfRoute('/:module/:action/*', array()));
+$r->connect('test', new \sfRoute('/:module', ['action' => 'index']));
+$r->connect('test1', new \sfRoute('/:module/:action/*', []));
 $route_names = array_keys($r->getRoutes());
 $r->clearRoutes();
-$r->prependRoute('test', new sfRoute('/:module', array('action' => 'index')));
-$r->prependRoute('test1', new sfRoute('/:module/:action/*', array()));
+$r->prependRoute('test', new \sfRoute('/:module', ['action' => 'index']));
+$r->prependRoute('test1', new \sfRoute('/:module/:action/*', []));
 $p_route_names = array_keys($r->getRoutes());
 $t->is(implode('-', $p_route_names), implode('-', array_reverse($route_names)), '->prependRoute() adds new routes at the beginning of the existings ones');
 
 // ->addRouteBefore()
 $t->diag('->insertRouteBefore()');
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:module', array('action' => 'index')));
-$r->connect('test3', new sfRoute('/:module/:action/*', array()));
-$r->insertRouteBefore('test3', 'test2', new sfRoute('/:module/:action', array('module' => 'default')));
+$r->connect('test1', new \sfRoute('/:module', ['action' => 'index']));
+$r->connect('test3', new \sfRoute('/:module/:action/*', []));
+$r->insertRouteBefore('test3', 'test2', new \sfRoute('/:module/:action', ['module' => 'default']));
 $route_names = array_keys($r->getRoutes());
 $r->clearRoutes();
-$r->connect('test1', new sfRoute('/:module', array('action' => 'index')));
-$r->connect('test2', new sfRoute('/:module/:action', array('module' => 'default')));
-$r->connect('test3', new sfRoute('/:module/:action/*', array()));
+$r->connect('test1', new \sfRoute('/:module', ['action' => 'index']));
+$r->connect('test2', new \sfRoute('/:module/:action', ['module' => 'default']));
+$r->connect('test3', new \sfRoute('/:module/:action/*', []));
 $test_route_names = array_keys($r->getRoutes());
 $t->is(implode('-', $test_route_names), implode('-', $route_names), '->insertRouteBefore() adds a new route before another existings one');
 $r->clearRoutes();
 $msg = '->insertRouteBefore() throws an sfConfigurationException when trying to insert a route before a non existent one';
 
 try {
-    $r->insertRouteBefore('test2', 'test', new sfRoute('/index.php/:module/:action', array('module' => 'default', 'action' => 'index')));
+    $r->insertRouteBefore('test2', 'test', new \sfRoute('/index.php/:module/:action', ['module' => 'default', 'action' => 'index']));
     $t->fail($msg);
-} catch (sfConfigurationException $e) {
+} catch (\sfConfigurationException $e) {
     $t->pass($msg);
 }
 
 // ->getCurrentInternalUri()
 $t->diag('->getCurrentInternalUri()');
 $r->clearRoutes();
-$r->connect('test2', new sfRoute('/module/action/:id', array('module' => 'foo', 'action' => 'bar')));
-$r->connect('test', new sfRoute('/:module', array('action' => 'index')));
-$r->connect('test1', new sfRoute('/:module/:action/*', array()));
-$r->connect('test3', new sfRoute('/', array()));
+$r->connect('test2', new \sfRoute('/module/action/:id', ['module' => 'foo', 'action' => 'bar']));
+$r->connect('test', new \sfRoute('/:module', ['action' => 'index']));
+$r->connect('test1', new \sfRoute('/:module/:action/*', []));
+$r->connect('test3', new \sfRoute('/', []));
 $r->parse('/');
 $t->is($r->getCurrentInternalUri(), 'default/index', '->getCurrentInternalUri() returns the internal URI for last parsed URL');
 $r->parse('/foo/bar/bar/foo/a/b');
@@ -512,12 +513,12 @@ public function generate($params, $context = array(), $absolute = false)
 
 // Lazy routes config cache
 $t->diag('Lazy Routes Config Cache');
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 $dispatcher->connect('routing.load_configuration', 'configureRouting');
 function configureRouting($event)
 {
-    $event->getSubject()->connect('first', new sfRoute('/first'));
-    $event->getSubject()->connect('second', new sfRoute('/', array()));
+    $event->getSubject()->connect('first', new \sfRoute('/first'));
+    $event->getSubject()->connect('second', new \sfRoute('/', []));
 }
 
 // these tests are against r7363
@@ -526,9 +527,9 @@ function configureRouting($event)
 $t->is($r->getCurrentInternalUri(false), 'foo/bar?id=2', '->getCurrentInternalUri() returns the internal URI for last parsed URL');
 
 // regression for ticket #3423  occuring when cache is used. (for the test its enough to have it non null)
-$rCached = new sfPatternRoutingTest(new sfEventDispatcher(), new sfNoCache(), $options);
-$rCached->connect('test', new sfRoute('/:module', array('action' => 'index')));
-$rCached->connect('test2', new sfRoute('/', array()));
+$rCached = new \sfPatternRoutingTest(new \sfEventDispatcher(), new \sfNoCache(), $options);
+$rCached->connect('test', new \sfRoute('/:module', ['action' => 'index']));
+$rCached->connect('test2', new \sfRoute('/', []));
 $rCached->parse('/');
 $t->is($rCached->getCurrentInternalUri(), 'default/index', '->getCurrentInternalUri() returns the internal URI for last parsed URL using cache');
 $rCached->parse('/test');
@@ -539,7 +540,7 @@ function configureRouting($event)
 $parameters = $rCached->findRoute('/test');
 $t->is(
     $parameters,
-    array('name' => 'test', 'pattern' => '/:module', 'parameters' => array('action' => 'index', 'module' => 'test')),
+    ['name' => 'test', 'pattern' => '/:module', 'parameters' => ['action' => 'index', 'module' => 'test']],
     '->findRoute() returns information about matching route'
 );
 $t->is($rCached->getCurrentInternalUri(), 'default/index', '->findRoute() does not change the internal URI of sfPatternRouting');
@@ -547,7 +548,7 @@ function configureRouting($event)
 
 // current internal uri is reset after negative match
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test', array('bar' => 'foo')));
+$r->connect('test', new \sfRoute('/test', ['bar' => 'foo']));
 $r->parse('/test');
 $r->parse('/notfound');
 $t->is($r->getCurrentInternalUri(), null, '->getCurrentInternalUri() reseted after negative match');
@@ -556,102 +557,102 @@ function configureRouting($event)
 // defaults
 $t->diag('defaults');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test', array('bar' => 'foo')));
-$params = array('module' => 'default', 'action' => 'index');
+$r->connect('test', new \sfRoute('/test', ['bar' => 'foo']));
+$params = ['module' => 'default', 'action' => 'index'];
 $url = '/test';
 $t->is($r->generate('', $params), $url, '->generate() routes takes default values into account when matching a route');
-$params = array('module' => 'default', 'action' => 'index', 'bar' => 'foo');
+$params = ['module' => 'default', 'action' => 'index', 'bar' => 'foo'];
 $t->is($r->generate('', $params), $url, '->generate() routes takes default values into account when matching a route');
-$params = array('module' => 'default', 'action' => 'index', 'bar' => 'bar');
+$params = ['module' => 'default', 'action' => 'index', 'bar' => 'bar'];
 
 try {
     $r->generate('', $params);
     $t->fail('->generate() throws a sfConfigurationException if no route matches the params');
-} catch (sfConfigurationException $e) {
+} catch (\sfConfigurationException $e) {
     $t->pass('->generate() throws a sfConfigurationException if no route matches the params');
 }
 
 // mandatory parameters
 $t->diag('mandatory parameters');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test/:foo/:bar'));
-$params = array('foo' => 'bar');
+$r->connect('test', new \sfRoute('/test/:foo/:bar'));
+$params = ['foo' => 'bar'];
 
 try {
     $r->generate('test', $params);
     $t->fail('->generate() throws a InvalidArgumentException if some mandatory parameters are not provided');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->generate() throws a InvalidArgumentException if some mandatory parameters are not provided');
 }
 
 // default module/action overriding
 $t->diag('module/action overriding');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/', array('module' => 'default1', 'action' => 'default1')));
-$params = array('module' => 'default1', 'action' => 'default1');
+$r->connect('test', new \sfRoute('/', ['module' => 'default1', 'action' => 'default1']));
+$params = ['module' => 'default1', 'action' => 'default1'];
 $t->is($r->parse('/'), $params, '->parse() overrides the default module/action if provided in the defaults');
 $t->is($r->generate('', $params), '/', '->generate() overrides the default module/action if provided in the defaults');
 
 // parameter values decoding
 $t->diag('parameter values decoding');
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/test/:value', array('module' => 'default', 'action' => 'index')));
-$r->connect('test1', new sfRoute('/test1/*', array('module' => 'default', 'action' => 'index')));
-$t->is($r->parse('/test/test%26foo%3Dbar%2Bfoo'), array('module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'), '->parse() decodes parameter values');
-$t->is($r->parse('/test1/value/test%26foo%3Dbar%2Bfoo'), array('module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'), '->parse() decodes parameter values');
+$r->connect('test', new \sfRoute('/test/:value', ['module' => 'default', 'action' => 'index']));
+$r->connect('test1', new \sfRoute('/test1/*', ['module' => 'default', 'action' => 'index']));
+$t->is($r->parse('/test/test%26foo%3Dbar%2Bfoo'), ['module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'], '->parse() decodes parameter values');
+$t->is($r->parse('/test1/value/test%26foo%3Dbar%2Bfoo'), ['module' => 'default', 'action' => 'index', 'value' => 'test&foo=bar+foo'], '->parse() decodes parameter values');
 
 // feature change bug from sf1.0 - ticket #3090
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/customer/:param1/:action/*', array('module' => 'default')));
-$r->connect('default', new sfRoute('/:module/:action'));
+$r->connect('test', new \sfRoute('/customer/:param1/:action/*', ['module' => 'default']));
+$r->connect('default', new \sfRoute('/:module/:action'));
 $url = '/customer/create';
-$params = array('module' => 'customer', 'action' => 'create');
+$params = ['module' => 'customer', 'action' => 'create'];
 $t->is($r->parse($url), $params, '->parse() /:module/:action route');
 
 $url = '/customer/param1/action';
-$params = array('module' => 'default', 'action' => 'action', 'param1' => 'param1');
+$params = ['module' => 'default', 'action' => 'action', 'param1' => 'param1'];
 $t->is($r->parse($url), $params, '->parse() /customer/:param1/:action/* route');
 
 $r->clearRoutes();
-$r->connect('test', new sfRoute('/customer/:id/:id_name', array('module' => 'default')));
-$t->is($r->generate('', array('id' => 2, 'id_name' => 'fabien')), '/customer/2/fabien', '->generate() first replaces the longest variable names');
+$r->connect('test', new \sfRoute('/customer/:id/:id_name', ['module' => 'default']));
+$t->is($r->generate('', ['id' => 2, 'id_name' => 'fabien']), '/customer/2/fabien', '->generate() first replaces the longest variable names');
 
 $r->clearRoutes();
-$r->connect('default', new sfAlwaysAbsoluteRoute('/:module/:action'));
-$t->is($r->generate('', array('module' => 'foo', 'action' => 'bar')), 'http://localhost/foo/bar', '->generate() allows route to generate absolute urls');
-$t->is($r->generate('', array('module' => 'foo', 'action' => 'bar'), true), 'http://localhost/foo/bar', '->generate() does not double-absolutize urls');
+$r->connect('default', new \sfAlwaysAbsoluteRoute('/:module/:action'));
+$t->is($r->generate('', ['module' => 'foo', 'action' => 'bar']), 'http://localhost/foo/bar', '->generate() allows route to generate absolute urls');
+$t->is($r->generate('', ['module' => 'foo', 'action' => 'bar'], true), 'http://localhost/foo/bar', '->generate() does not double-absolutize urls');
 
 $t->diag('suffix handling with generate_shortest_url option');
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array('generate_shortest_url' => true, 'extra_parameters_as_query_string' => false, 'suffix' => '.html'));
-$r->connect('test2', new sfRoute('/users/:username/:sort/:start/', array('module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0'), array('requirements' => array('username' => '\w+', 'start' => '\d+'))));
-$t->is($r->generate('', array('username' => 'test1', 'module' => 'user', 'action' => 'show')), '/users/test1/', '->generate() creates URL when using suffix and generate_shortest_url');
-$t->is($r->generate('', array('username' => 'test1', 'module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '1')), '/users/test1/all/1/', '->generate() creates URL when using suffix and generate_shortest_url');
-$t->is($r->parse('/users/test1/'), array('module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0', 'username' => 'test1'), '->parse() returns all default parameters when provided suffix and generate_shortest_url enabled with / suffix');
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, ['generate_shortest_url' => true, 'extra_parameters_as_query_string' => false, 'suffix' => '.html']);
+$r->connect('test2', new \sfRoute('/users/:username/:sort/:start/', ['module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0'], ['requirements' => ['username' => '\w+', 'start' => '\d+']]));
+$t->is($r->generate('', ['username' => 'test1', 'module' => 'user', 'action' => 'show']), '/users/test1/', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->generate('', ['username' => 'test1', 'module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '1']), '/users/test1/all/1/', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->parse('/users/test1/'), ['module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0', 'username' => 'test1'], '->parse() returns all default parameters when provided suffix and generate_shortest_url enabled with / suffix');
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array('generate_shortest_url' => true, 'extra_parameters_as_query_string' => false, 'suffix' => '.html'));
-$r->connect('test1', new sfRoute('/users/:username/:sort/:start', array('module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0'), array('requirements' => array('username' => '\w+', 'start' => '\d+'))));
-$t->is($r->generate('', array('username' => 'test1', 'module' => 'user', 'action' => 'show')), '/users/test1.html', '->generate() creates URL when using suffix and generate_shortest_url');
-$t->is($r->generate('', array('username' => 'test1', 'module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0')), '/users/test1.html', '->generate() creates URL when using suffix and generate_shortest_url');
-$t->is($r->generate('', array('username' => 'test1', 'module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '1')), '/users/test1/all/1.html', '->generate() creates URL when using suffix and generate_shortest_url');
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, ['generate_shortest_url' => true, 'extra_parameters_as_query_string' => false, 'suffix' => '.html']);
+$r->connect('test1', new \sfRoute('/users/:username/:sort/:start', ['module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0'], ['requirements' => ['username' => '\w+', 'start' => '\d+']]));
+$t->is($r->generate('', ['username' => 'test1', 'module' => 'user', 'action' => 'show']), '/users/test1.html', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->generate('', ['username' => 'test1', 'module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0']), '/users/test1.html', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->generate('', ['username' => 'test1', 'module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '1']), '/users/test1/all/1.html', '->generate() creates URL when using suffix and generate_shortest_url');
 
-$t->is($r->parse('/users/test1.html'), array('module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0', 'username' => 'test1'), '->parse() returns all default parameters when provided suffix and generate_shortest_url enabled with .html suffix');
+$t->is($r->parse('/users/test1.html'), ['module' => 'user', 'action' => 'show', 'sort' => 'all', 'start' => '0', 'username' => 'test1'], '->parse() returns all default parameters when provided suffix and generate_shortest_url enabled with .html suffix');
 
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), null, array('generate_shortest_url' => true, 'extra_parameters_as_query_string' => false, 'suffix' => '.html'));
-$r->connect('posts', new sfRoute('/posts', array('module' => 'posts', 'action' => 'index', 'page' => '1')));
-$r->connect('posts_pages', new sfRoute('/posts/:page', array('module' => 'posts', 'action' => 'index', 'page' => '1')));
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), null, ['generate_shortest_url' => true, 'extra_parameters_as_query_string' => false, 'suffix' => '.html']);
+$r->connect('posts', new \sfRoute('/posts', ['module' => 'posts', 'action' => 'index', 'page' => '1']));
+$r->connect('posts_pages', new \sfRoute('/posts/:page', ['module' => 'posts', 'action' => 'index', 'page' => '1']));
 
-$t->is($r->generate('', array('module' => 'posts', 'action' => 'index')), '/posts.html', '->generate() creates URL when using suffix and generate_shortest_url');
-$t->is($r->generate('', array('module' => 'posts', 'action' => 'index', 'page' => '1')), '/posts.html', '->generate() creates URL when using suffix and generate_shortest_url');
-$t->is($r->generate('', array('module' => 'posts', 'action' => 'index', 'page' => '2')), '/posts/2.html', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->generate('', ['module' => 'posts', 'action' => 'index']), '/posts.html', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->generate('', ['module' => 'posts', 'action' => 'index', 'page' => '1']), '/posts.html', '->generate() creates URL when using suffix and generate_shortest_url');
+$t->is($r->generate('', ['module' => 'posts', 'action' => 'index', 'page' => '2']), '/posts/2.html', '->generate() creates URL when using suffix and generate_shortest_url');
 
 $t->diag('load_configuration with serialized routes');
 
 // see fixtures/config_routing.yml.php
-$r = new sfPatternRoutingTest(new sfEventDispatcher(), new sfNoCache(), array('load_configuration' => true));
+$r = new \sfPatternRoutingTest(new \sfEventDispatcher(), new \sfNoCache(), ['load_configuration' => true]);
 $t->ok($r->hasRouteName('test1'), '->loadConfiguration() Config file is loaded');
 $routes = $r->getRoutes();
 $t->ok(is_string($routes['test1']), '->loadConfiguration() Route objects are not serialized in cache');
 $route = $r->getRoute('test1');
 $t->ok(is_object($route), '->loadConfiguration() Route objects are unserialized on demand');
-$t->is_deeply($r->parse('/'), array('module' => 'default', 'action' => 'index'), '->parse() Default parameters are applied to serialized routes');
+$t->is_deeply($r->parse('/'), ['module' => 'default', 'action' => 'index'], '->parse() Default parameters are applied to serialized routes');
diff --git a/test/unit/routing/sfRequestRouteTest.php b/test/unit/routing/sfRequestRouteTest.php
index 01cc457b6..be40cc5be 100644
--- a/test/unit/routing/sfRequestRouteTest.php
+++ b/test/unit/routing/sfRequestRouteTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,40 +11,40 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
 // ->__construct()
 $t->diag('->__construct()');
 
-$route = new sfRequestRoute('/');
+$route = new \sfRequestRoute('/');
 $requirements = $route->getRequirements();
-$t->is_deeply($requirements['sf_method'], array('get', 'head'), '->__construct() applies a default "sf_method" requirement of GET or HEAD');
+$t->is_deeply($requirements['sf_method'], ['get', 'head'], '->__construct() applies a default "sf_method" requirement of GET or HEAD');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => array('post')));
+$route = new \sfRequestRoute('/', [], ['sf_method' => ['post']]);
 $requirements = $route->getRequirements();
-$t->is_deeply($requirements['sf_method'], array('post'), '->__construct() does not apply a default "sf_method" requirement if one is already set');
+$t->is_deeply($requirements['sf_method'], ['post'], '->__construct() does not apply a default "sf_method" requirement if one is already set');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => 'get'));
+$route = new \sfRequestRoute('/', [], ['sf_method' => 'get']);
 $requirements = $route->getRequirements();
-$t->is_deeply($requirements['sf_method'], array('get'), '->__construct() converts a string "sf_method" requirement to an array');
+$t->is_deeply($requirements['sf_method'], ['get'], '->__construct() converts a string "sf_method" requirement to an array');
 
 // ->matchesParameters()
 $t->diag('->matchesParameters()');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => array('get', 'head')));
-$t->ok($route->matchesParameters(array('sf_method' => 'get')), '->matchesParameters() matches the "sf_method" parameter');
+$route = new \sfRequestRoute('/', [], ['sf_method' => ['get', 'head']]);
+$t->ok($route->matchesParameters(['sf_method' => 'get']), '->matchesParameters() matches the "sf_method" parameter');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => array('get')));
-$t->ok($route->matchesParameters(array('sf_method' => 'GET')), '->matchesParameters() checks "sf_method" requirement case-insensitively');
+$route = new \sfRequestRoute('/', [], ['sf_method' => ['get']]);
+$t->ok($route->matchesParameters(['sf_method' => 'GET']), '->matchesParameters() checks "sf_method" requirement case-insensitively');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => array('GET')));
-$t->ok($route->matchesParameters(array('sf_method' => 'get')), '->matchesParameters() checks "sf_method" requirement case-insensitively');
+$route = new \sfRequestRoute('/', [], ['sf_method' => ['GET']]);
+$t->ok($route->matchesParameters(['sf_method' => 'get']), '->matchesParameters() checks "sf_method" requirement case-insensitively');
 
 // ->matchesUrl()
 $t->diag('->matchesUrl()');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => 'GET'));
-$t->isa_ok($route->matchesUrl('/', array('method' => 'get')), 'array', '->matchesUrl() check "sf_method" requirement case-insensitively');
+$route = new \sfRequestRoute('/', [], ['sf_method' => 'GET']);
+$t->isa_ok($route->matchesUrl('/', ['method' => 'get']), 'array', '->matchesUrl() check "sf_method" requirement case-insensitively');
 
-$route = new sfRequestRoute('/', array(), array('sf_method' => 'get'));
-$t->isa_ok($route->matchesUrl('/', array('method' => 'GET')), 'array', '->matchesUrl() check "sf_method" requirement case-insensitively');
+$route = new \sfRequestRoute('/', [], ['sf_method' => 'get']);
+$t->isa_ok($route->matchesUrl('/', ['method' => 'GET']), 'array', '->matchesUrl() check "sf_method" requirement case-insensitively');
diff --git a/test/unit/routing/sfRouteTest.php b/test/unit/routing/sfRouteTest.php
index ecfcba102..be8b3e9cc 100644
--- a/test/unit/routing/sfRouteTest.php
+++ b/test/unit/routing/sfRouteTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,77 +11,77 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(65);
+$t = new \lime_test(65);
 
 // ->matchesUrl()
 $t->diag('->matchesUrl()');
-$route = new sfRoute('/');
-$t->is($route->matchesUrl('/'), array(), '->matchesUrl() takes a URL as its first argument');
+$route = new \sfRoute('/');
+$t->is($route->matchesUrl('/'), [], '->matchesUrl() takes a URL as its first argument');
 $t->is($route->matchesUrl('/foo'), false, '->matchesUrl() returns false if the route does not match');
 
-$route = new sfRoute('/', array('foo' => 'bar'));
-$t->is($route->matchesUrl('/'), array('foo' => 'bar'), '->matchesUrl() returns default values for parameters not in the route');
+$route = new \sfRoute('/', ['foo' => 'bar']);
+$t->is($route->matchesUrl('/'), ['foo' => 'bar'], '->matchesUrl() returns default values for parameters not in the route');
 
-$route = new sfRoute('/:bar', array('foo' => 'bar'));
-$t->is($route->matchesUrl('/foobar'), array('foo' => 'bar', 'bar' => 'foobar'), '->matchesUrl() returns variables from the pattern');
+$route = new \sfRoute('/:bar', ['foo' => 'bar']);
+$t->is($route->matchesUrl('/foobar'), ['foo' => 'bar', 'bar' => 'foobar'], '->matchesUrl() returns variables from the pattern');
 
-$route = new sfRoute('/:foo', array('foo' => 'bar'));
-$t->is($route->matchesUrl('/foobar'), array('foo' => 'foobar'), '->matchesUrl() overrides default value with pattern value');
+$route = new \sfRoute('/:foo', ['foo' => 'bar']);
+$t->is($route->matchesUrl('/foobar'), ['foo' => 'foobar'], '->matchesUrl() overrides default value with pattern value');
 
-$route = new sfRoute('/:foo', array('foo' => 'bar'));
-$t->is($route->matchesUrl('/'), array('foo' => 'bar'), '->matchesUrl() matches routes with an optional parameter at the end');
+$route = new \sfRoute('/:foo', ['foo' => 'bar']);
+$t->is($route->matchesUrl('/'), ['foo' => 'bar'], '->matchesUrl() matches routes with an optional parameter at the end');
 
-$route = new sfRoute('/:foo', array('foo' => null));
-$t->is($route->matchesUrl('/'), array('foo' => null), '->matchesUrl() matches routes with an optional parameter at the end, even if it is null');
+$route = new \sfRoute('/:foo', ['foo' => null]);
+$t->is($route->matchesUrl('/'), ['foo' => null], '->matchesUrl() matches routes with an optional parameter at the end, even if it is null');
 
-$route = new sfRoute('/:foo', array('foo' => ''));
-$t->is($route->matchesUrl('/'), array('foo' => ''), '->matchesUrl() matches routes with an optional parameter at the end, even if it is empty');
+$route = new \sfRoute('/:foo', ['foo' => '']);
+$t->is($route->matchesUrl('/'), ['foo' => ''], '->matchesUrl() matches routes with an optional parameter at the end, even if it is empty');
 
-$route = new sfRoute('/:foo/bar', array('foo' => null));
+$route = new \sfRoute('/:foo/bar', ['foo' => null]);
 $t->is($route->matchesUrl('//bar'), false, '->matchesUrl() does not match routes with an empty parameter not at the end');
 $t->is($route->matchesUrl('/bar'), false, '->matchesUrl() does not match routes with an empty parameter not at the end');
 
-$route = new sfRoute('/foo/:foo/bar/:bar', array('foo' => 'bar', 'bar' => 'foo'));
-$t->is($route->matchesUrl('/foo/bar/bar'), array('foo' => 'bar', 'bar' => 'foo'), '->matchesUrl() matches routes with an optional parameter at the end');
+$route = new \sfRoute('/foo/:foo/bar/:bar', ['foo' => 'bar', 'bar' => 'foo']);
+$t->is($route->matchesUrl('/foo/bar/bar'), ['foo' => 'bar', 'bar' => 'foo'], '->matchesUrl() matches routes with an optional parameter at the end');
 
-$route = new sfRoute('/:foo/:bar', array('foo' => 'bar', 'bar' => 'foo'));
-$t->is($route->matchesUrl('/'), array('foo' => 'bar', 'bar' => 'foo'), '->matchesUrl() matches routes with multiple optionals parameters at the end');
+$route = new \sfRoute('/:foo/:bar', ['foo' => 'bar', 'bar' => 'foo']);
+$t->is($route->matchesUrl('/'), ['foo' => 'bar', 'bar' => 'foo'], '->matchesUrl() matches routes with multiple optionals parameters at the end');
 
-$route = new sfRoute('/', array());
-$route->setDefaultParameters(array('foo' => 'bar'));
-$t->is($route->matchesUrl('/'), array('foo' => 'bar'), '->matchesUrl() gets default parameters from the routing object if it exists');
+$route = new \sfRoute('/', []);
+$route->setDefaultParameters(['foo' => 'bar']);
+$t->is($route->matchesUrl('/'), ['foo' => 'bar'], '->matchesUrl() gets default parameters from the routing object if it exists');
 
-$route = new sfRoute('/', array('foo' => 'foobar'));
-$route->setDefaultParameters(array('foo' => 'bar'));
-$t->is($route->matchesUrl('/'), array('foo' => 'foobar'), '->matchesUrl() overrides routing default parameters with route default parameters');
+$route = new \sfRoute('/', ['foo' => 'foobar']);
+$route->setDefaultParameters(['foo' => 'bar']);
+$t->is($route->matchesUrl('/'), ['foo' => 'foobar'], '->matchesUrl() overrides routing default parameters with route default parameters');
 
-$route = new sfRoute('/:foo', array('foo' => 'foobar'));
-$route->setDefaultParameters(array('foo' => 'bar'));
-$t->is($route->matchesUrl('/barfoo'), array('foo' => 'barfoo'), '->matchesUrl() overrides routing default parameters with pattern parameters');
+$route = new \sfRoute('/:foo', ['foo' => 'foobar']);
+$route->setDefaultParameters(['foo' => 'bar']);
+$t->is($route->matchesUrl('/barfoo'), ['foo' => 'barfoo'], '->matchesUrl() overrides routing default parameters with pattern parameters');
 
-$route = new sfRoute('/:foo', array(), array('foo' => '\d+'));
+$route = new \sfRoute('/:foo', [], ['foo' => '\d+']);
 $t->is($route->matchesUrl('/bar'), false, '->matchesUrl() enforces requirements');
 
-$route = new sfRoute('/:foo', array(), array('foo' => '\w+'));
-$t->is($route->matchesUrl('/bar'), array('foo' => 'bar'), '->matchesUrl() enforces requirements');
+$route = new \sfRoute('/:foo', [], ['foo' => '\w+']);
+$t->is($route->matchesUrl('/bar'), ['foo' => 'bar'], '->matchesUrl() enforces requirements');
 
 // ->matchesParameters()
 $t->diag('->matchesParameters()');
-$route = new sfRoute('/', array());
+$route = new \sfRoute('/', []);
 $t->is($route->matchesParameters('string'), false, '->matchesParameters() returns false if the argument is not an array of parameters');
 
-$route = new sfRoute('/:foo');
-$t->is($route->matchesParameters(array()), false, '->matchesParameters() returns false if one of the pattern variable is not provided');
+$route = new \sfRoute('/:foo');
+$t->is($route->matchesParameters([]), false, '->matchesParameters() returns false if one of the pattern variable is not provided');
 
-$route = new sfRoute('/:foo', array('foo' => 'bar'));
-$t->is($route->matchesParameters(array()), true, '->matchesParameters() merges the default parameters with the provided parameters to match the route');
+$route = new \sfRoute('/:foo', ['foo' => 'bar']);
+$t->is($route->matchesParameters([]), true, '->matchesParameters() merges the default parameters with the provided parameters to match the route');
 
-$route = new sfRoute('/:foo');
-$t->is($route->matchesParameters(array('foo' => 'bar')), true, '->matchesParameters() matches if all variables are given as parameters');
+$route = new \sfRoute('/:foo');
+$t->is($route->matchesParameters(['foo' => 'bar']), true, '->matchesParameters() matches if all variables are given as parameters');
 
-$route = new sfRoute('/:foo');
-$t->is($route->matchesParameters(array('foo' => '')), true, '->matchesParameters() matches if optional parameters empty');
-$t->is($route->matchesParameters(array('foo' => null)), true, '->matchesParameters() matches if optional parameters empty');
+$route = new \sfRoute('/:foo');
+$t->is($route->matchesParameters(['foo' => '']), true, '->matchesParameters() matches if optional parameters empty');
+$t->is($route->matchesParameters(['foo' => null]), true, '->matchesParameters() matches if optional parameters empty');
 
 /*
 $route = new sfRoute('/:foo/bar');
@@ -88,41 +89,41 @@
 $t->is($route->matchesParameters(array('foo' => null)), false, '->matchesParameters() does not match is required parameters are empty');
 */
 
-$route = new sfRoute('/:foo');
-$route->setDefaultParameters(array('foo' => 'bar'));
-$t->is($route->matchesParameters(array()), true, '->matchesParameters() merges the routing default parameters with the provided parameters to match the route');
+$route = new \sfRoute('/:foo');
+$route->setDefaultParameters(['foo' => 'bar']);
+$t->is($route->matchesParameters([]), true, '->matchesParameters() merges the routing default parameters with the provided parameters to match the route');
 
-$route = new sfRoute('/:foo', array(), array('foo' => '\d+'));
-$t->is($route->matchesParameters(array('foo' => 'bar')), false, '->matchesParameters() enforces requirements');
+$route = new \sfRoute('/:foo', [], ['foo' => '\d+']);
+$t->is($route->matchesParameters(['foo' => 'bar']), false, '->matchesParameters() enforces requirements');
 
-$route = new sfRoute('/:foo', array(), array('foo' => '\d+'));
-$t->is($route->matchesParameters(array('foo' => 12)), true, '->matchesParameters() enforces requirements');
+$route = new \sfRoute('/:foo', [], ['foo' => '\d+']);
+$t->is($route->matchesParameters(['foo' => 12]), true, '->matchesParameters() enforces requirements');
 
-$route = new sfRoute('/', array('foo' => 'bar'));
-$t->is($route->matchesParameters(array('foo' => 'foobar')), false, '->matchesParameters() checks that there is no parameter that is not a pattern variable');
+$route = new \sfRoute('/', ['foo' => 'bar']);
+$t->is($route->matchesParameters(['foo' => 'foobar']), false, '->matchesParameters() checks that there is no parameter that is not a pattern variable');
 
-$route = new sfRoute('/', array('foo' => 'bar'));
-$t->is($route->matchesParameters(array('foo' => 'bar')), true, '->matchesParameters() can override a parameter that is not a pattern variable if the value is the same as the default one');
+$route = new \sfRoute('/', ['foo' => 'bar']);
+$t->is($route->matchesParameters(['foo' => 'bar']), true, '->matchesParameters() can override a parameter that is not a pattern variable if the value is the same as the default one');
 
-$route = new sfRoute('/:foo', array('bar' => 'foo'));
-$t->is($route->matchesParameters(array('foo' => 'bar', 'bar' => 'foo')), true, '->matchesParameters() can override a parameter that is not a pattern variable if the value is the same as the default one');
+$route = new \sfRoute('/:foo', ['bar' => 'foo']);
+$t->is($route->matchesParameters(['foo' => 'bar', 'bar' => 'foo']), true, '->matchesParameters() can override a parameter that is not a pattern variable if the value is the same as the default one');
 
-$route = new sfRoute('/:foo');
-$t->is($route->matchesParameters(array('foo' => 'bar', 'bar' => 'foo')), true, '->generate() matches even if there are extra parameters');
+$route = new \sfRoute('/:foo');
+$t->is($route->matchesParameters(['foo' => 'bar', 'bar' => 'foo']), true, '->generate() matches even if there are extra parameters');
 
-$route = new sfRoute('/:foo', array(), array(), array('extra_parameters_as_query_string' => false));
-$t->is($route->matchesParameters(array('foo' => 'bar', 'bar' => 'foo')), false, '->generate() does not match if there are extra parameters if extra_parameters_as_query_string is set to false');
+$route = new \sfRoute('/:foo', [], [], ['extra_parameters_as_query_string' => false]);
+$t->is($route->matchesParameters(['foo' => 'bar', 'bar' => 'foo']), false, '->generate() does not match if there are extra parameters if extra_parameters_as_query_string is set to false');
 
 // ->generate()
 $t->diag('->generate()');
-$route = new sfRoute('/:foo');
-$t->is($route->generate(array('foo' => 'bar')), '/bar', '->generate() generates a URL with the given parameters');
-$route = new sfRoute('/:foo/:foobar');
-$t->is($route->generate(array('foo' => 'bar', 'foobar' => 'barfoo')), '/bar/barfoo', '->generate() replaces longer variables first');
-
-$route = new sfRoute('/:foo');
-$t->is($route->generate(array('foo' => '')), '/', '->generate() generates a route if a variable is empty');
-$t->is($route->generate(array('foo' => null)), '/', '->generate() generates a route if a variable is empty');
+$route = new \sfRoute('/:foo');
+$t->is($route->generate(['foo' => 'bar']), '/bar', '->generate() generates a URL with the given parameters');
+$route = new \sfRoute('/:foo/:foobar');
+$t->is($route->generate(['foo' => 'bar', 'foobar' => 'barfoo']), '/bar/barfoo', '->generate() replaces longer variables first');
+
+$route = new \sfRoute('/:foo');
+$t->is($route->generate(['foo' => '']), '/', '->generate() generates a route if a variable is empty');
+$t->is($route->generate(['foo' => null]), '/', '->generate() generates a route if a variable is empty');
 /*
 $route = new sfRoute('/:foo/bar');
 try
@@ -144,57 +145,57 @@
   $t->pass('->generate() cannot generate a route if a variable is empty and mandatory');
 }
 */
-$route = new sfRoute('/:foo');
-$t->is($route->generate(array('foo' => 'bar', 'bar' => 'foo')), '/bar?bar=foo', '->generate() generates extra parameters as a query string');
+$route = new \sfRoute('/:foo');
+$t->is($route->generate(['foo' => 'bar', 'bar' => 'foo']), '/bar?bar=foo', '->generate() generates extra parameters as a query string');
 
-$route = new sfRoute('/:foo', array(), array(), array('extra_parameters_as_query_string' => false));
-$t->is($route->generate(array('foo' => 'bar', 'bar' => 'foo')), '/bar', '->generate() ignores extra parameters if extra_parameters_as_query_string is false');
+$route = new \sfRoute('/:foo', [], [], ['extra_parameters_as_query_string' => false]);
+$t->is($route->generate(['foo' => 'bar', 'bar' => 'foo']), '/bar', '->generate() ignores extra parameters if extra_parameters_as_query_string is false');
 
 // checks that explicit 0 values also work - see #5175
-$route = new sfRoute('/:foo', array(), array(), array('extra_parameters_as_query_string' => true));
-$t->is($route->generate(array('foo' => 'bar', 'bar' => '0')), '/bar?bar=0', '->generate() adds extra parameters if extra_parameters_as_query_string is true');
+$route = new \sfRoute('/:foo', [], [], ['extra_parameters_as_query_string' => true]);
+$t->is($route->generate(['foo' => 'bar', 'bar' => '0']), '/bar?bar=0', '->generate() adds extra parameters if extra_parameters_as_query_string is true');
 
-$route = new sfRoute('/:foo/:bar', array('bar' => 'foo'));
-$t->is($route->generate(array('foo' => 'bar')), '/bar', '->generate() generates the shortest URL possible');
+$route = new \sfRoute('/:foo/:bar', ['bar' => 'foo']);
+$t->is($route->generate(['foo' => 'bar']), '/bar', '->generate() generates the shortest URL possible');
 
-$route = new sfRoute('/:foo/:bar', array('bar' => 'foo'), array(), array('generate_shortest_url' => false));
-$t->is($route->generate(array('foo' => 'bar')), '/bar/foo', '->generate() generates the longest URL possible if generate_shortest_url is false');
+$route = new \sfRoute('/:foo/:bar', ['bar' => 'foo'], [], ['generate_shortest_url' => false]);
+$t->is($route->generate(['foo' => 'bar']), '/bar/foo', '->generate() generates the longest URL possible if generate_shortest_url is false');
 
 // ->parseStarParameter()
 $t->diag('->parseStarParameter()');
-$route = new sfRoute('/foo/*');
-$t->is($route->matchesUrl('/foo/foo/bar/bar/foo'), array('foo' => 'bar', 'bar' => 'foo'), '->parseStarParameter() parses * as key/value pairs');
-$t->is($route->matchesUrl('/foo/foo/foo.bar'), array('foo' => 'foo.bar'), '->parseStarParameter() uses / as the key/value separator');
-$t->is($route->matchesUrl('/foo'), array(), '->parseStarParameter() returns no additional parameters if the * value is empty');
+$route = new \sfRoute('/foo/*');
+$t->is($route->matchesUrl('/foo/foo/bar/bar/foo'), ['foo' => 'bar', 'bar' => 'foo'], '->parseStarParameter() parses * as key/value pairs');
+$t->is($route->matchesUrl('/foo/foo/foo.bar'), ['foo' => 'foo.bar'], '->parseStarParameter() uses / as the key/value separator');
+$t->is($route->matchesUrl('/foo'), [], '->parseStarParameter() returns no additional parameters if the * value is empty');
 
-$route = new sfRoute('/foo/*', array('module' => 'foo'));
-$t->is($route->matchesUrl('/foo/foo/bar/module/barbar'), array('foo' => 'bar', 'module' => 'foo'), '->parseStarParameter() cannot override special module/sction values');
+$route = new \sfRoute('/foo/*', ['module' => 'foo']);
+$t->is($route->matchesUrl('/foo/foo/bar/module/barbar'), ['foo' => 'bar', 'module' => 'foo'], '->parseStarParameter() cannot override special module/sction values');
 
-$route = new sfRoute('/foo/*', array('foo' => 'foo'));
-$t->is($route->matchesUrl('/foo/foo/bar'), array('foo' => 'bar'), '->parseStarParameter() can override a default value');
+$route = new \sfRoute('/foo/*', ['foo' => 'foo']);
+$t->is($route->matchesUrl('/foo/foo/bar'), ['foo' => 'bar'], '->parseStarParameter() can override a default value');
 
-$route = new sfRoute('/:foo/*');
-$t->is($route->matchesUrl('/bar/foo/barbar'), array('foo' => 'bar'), '->parseStarParameter() cannot override pattern variables');
+$route = new \sfRoute('/:foo/*');
+$t->is($route->matchesUrl('/bar/foo/barbar'), ['foo' => 'bar'], '->parseStarParameter() cannot override pattern variables');
 
-$route = new sfRoute('/foo/*/bar');
-$t->is($route->matchesUrl('/foo/foo/bar/bar'), array('foo' => 'bar'), '->parseStarParameter() is able to parse a star in the middle of a rule');
-$t->is($route->matchesUrl('/foo/bar'), array(), '->parseStarParameter() is able to parse a star if it is empty');
+$route = new \sfRoute('/foo/*/bar');
+$t->is($route->matchesUrl('/foo/foo/bar/bar'), ['foo' => 'bar'], '->parseStarParameter() is able to parse a star in the middle of a rule');
+$t->is($route->matchesUrl('/foo/bar'), [], '->parseStarParameter() is able to parse a star if it is empty');
 
 // ->generateStarParameter()
 $t->diag('->generateStarParameter()');
-$route = new sfRoute('/foo/:foo/*');
-$t->is($route->generate(array('foo' => 'bar', 'bar' => 'foo')), '/foo/bar/bar/foo', '->generateStarParameter() replaces * with all the key/pair values that are not variables');
+$route = new \sfRoute('/foo/:foo/*');
+$t->is($route->generate(['foo' => 'bar', 'bar' => 'foo']), '/foo/bar/bar/foo', '->generateStarParameter() replaces * with all the key/pair values that are not variables');
 
 // custom token
 $t->diag('custom token');
 
-class MyRoute extends sfRoute
+class MyRoute extends \sfRoute
 {
     protected function tokenizeBufferBefore(&$buffer, &$tokens, &$afterASeparator, &$currentSeparator)
     {
         if ($afterASeparator && preg_match('#^=('.$this->options['variable_regex'].')#', $buffer, $match)) {
             // a labelled variable
-            $this->tokens[] = array('label', $currentSeparator, $match[0], $match[1]);
+            $this->tokens[] = ['label', $currentSeparator, $match[0], $match[1]];
 
             $currentSeparator = '';
             $buffer = substr($buffer, strlen($match[0]));
@@ -226,11 +227,11 @@ protected function generateForLabel($optional, $tparams, $separator, $name, $var
     }
 }
 
-$route = new MyRoute('/=foo');
-$t->is($route->matchesUrl('/foo/bar'), array('foo' => 'bar'), '->tokenizeBufferBefore() allows to add a custom token');
-$t->is($route->generate(array('foo' => 'bar')), '/foo/bar', '->compileForLabel() adds logic to generate a route for a custom token');
+$route = new \MyRoute('/=foo');
+$t->is($route->matchesUrl('/foo/bar'), ['foo' => 'bar'], '->tokenizeBufferBefore() allows to add a custom token');
+$t->is($route->generate(['foo' => 'bar']), '/foo/bar', '->compileForLabel() adds logic to generate a route for a custom token');
 
-class CompileCheckRoute extends sfRoute
+class CompileCheckRoute extends \sfRoute
 {
     public function isCompiled()
     {
@@ -240,27 +241,27 @@ public function isCompiled()
 
 // state checking
 $t->diag('state checking');
-$route = new CompileCheckRoute('/foo');
+$route = new \CompileCheckRoute('/foo');
 $t->is($route->isCompiled(), false, '__construct() creates an uncompiled instanceof sfRoute');
 $t->is($route->isBound(), false, '->isBound() returns false before binding');
-$route->bind(null, array('foo' => 'bar'));
+$route->bind(null, ['foo' => 'bar']);
 $t->is($route->isBound(), true, '->isBound() returns true after binding');
-$t->is($route->getParameters(), array('foo' => 'bar'), '->getParameters() compiles the route and returns parameters');
+$t->is($route->getParameters(), ['foo' => 'bar'], '->getParameters() compiles the route and returns parameters');
 $t->is($route->isCompiled(), true, '->getParameters() compiles the route and returns parameters');
 
-$route = new CompileCheckRoute('/foo');
+$route = new \CompileCheckRoute('/foo');
 $t->is($route->getPattern(), '/foo', '->getPattern() compiles the route and returns the pattern');
 $t->is($route->isCompiled(), true, '->getPattern() compiles the route and returns pattern');
 
-$route = new CompileCheckRoute('/foo', array('default' => 'bar'));
-$t->is($route->getDefaults(), array('default' => 'bar'), '->getDefaults() compiles the route and returns the defaults');
+$route = new \CompileCheckRoute('/foo', ['default' => 'bar']);
+$t->is($route->getDefaults(), ['default' => 'bar'], '->getDefaults() compiles the route and returns the defaults');
 $t->is($route->isCompiled(), true, '->getDefaults() compiles the route and returns defaults');
 
-$route = new CompileCheckRoute('/foo', array(), array('requirements' => 'bar'));
-$t->is($route->getRequirements(), array('requirements' => 'bar'), '->getRequirements() compiles the route and returns the requirements');
+$route = new \CompileCheckRoute('/foo', [], ['requirements' => 'bar']);
+$t->is($route->getRequirements(), ['requirements' => 'bar'], '->getRequirements() compiles the route and returns the requirements');
 $t->is($route->isCompiled(), true, '->getRequirements() compiles the route and returns requirements');
 
-$route = new CompileCheckRoute('/foo', array(), array(), array('options' => 'bar'));
+$route = new \CompileCheckRoute('/foo', [], [], ['options' => 'bar']);
 $options = $route->getOptions();
 $t->is($options['options'], 'bar', '->getOptions() compiles the route and returns the compiled options');
 $t->is(count($options) > 1, true, '->getOptions() compiles the route and returns many compiled options');
diff --git a/test/unit/service/fixtures/containers/container10.php b/test/unit/service/fixtures/containers/container10.php
index 6a8555c33..738ecce70 100644
--- a/test/unit/service/fixtures/containers/container10.php
+++ b/test/unit/service/fixtures/containers/container10.php
@@ -1,10 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../includes/classes.php';
 
-$container = new sfServiceContainerBuilder();
+$container = new \sfServiceContainerBuilder();
 $container->
   register('foo', 'FooClass')->
-  addArgument(new sfServiceReference('bar'));
+  addArgument(new \sfServiceReference('bar'));
 
 return $container;
diff --git a/test/unit/service/fixtures/containers/container8.php b/test/unit/service/fixtures/containers/container8.php
index 0b5e37f9b..810715635 100644
--- a/test/unit/service/fixtures/containers/container8.php
+++ b/test/unit/service/fixtures/containers/container8.php
@@ -1,10 +1,19 @@
 <?php
 
-$container = new sfServiceContainerBuilder();
-$container->setParameters(array(
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+$container = new \sfServiceContainerBuilder();
+$container->setParameters([
     'FOO' => 'bar',
     'bar' => 'foo is %foo bar',
-    'values' => array(true, false, null, 0, 1000.3, 'true', 'false', 'null'),
-));
+    'values' => [true, false, null, 0, 1000.3, 'true', 'false', 'null'],
+]);
 
 return $container;
diff --git a/test/unit/service/fixtures/containers/container9.php b/test/unit/service/fixtures/containers/container9.php
index 1728e6d6b..c38b5512d 100644
--- a/test/unit/service/fixtures/containers/container9.php
+++ b/test/unit/service/fixtures/containers/container9.php
@@ -1,32 +1,41 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../includes/classes.php';
 
-$container = new sfServiceContainerBuilder();
+$container = new \sfServiceContainerBuilder();
 $container->
   register('foo', 'FooClass')->
   setConstructor('getInstance')->
-  setArguments(array('foo', new sfServiceReference('foo.baz'), array('%foo%' => 'foo is %foo%'), true, new sfServiceReference('service_container')))->
+  setArguments(['foo', new \sfServiceReference('foo.baz'), ['%foo%' => 'foo is %foo%'], true, new \sfServiceReference('service_container')])->
   setFile(realpath(__DIR__.'/../includes/foo.php'))->
   setShared(false)->
-  addMethodCall('setBar', array('bar'))->
+  addMethodCall('setBar', ['bar'])->
   addMethodCall('initialize')->
   setConfigurator('sc_configure');
 $container->
   register('bar', 'FooClass')->
-  setArguments(array('foo', new sfServiceReference('foo.baz'), new sfServiceParameter('foo_bar')))->
+  setArguments(['foo', new \sfServiceReference('foo.baz'), new \sfServiceParameter('foo_bar')])->
   setShared(true)->
-  setConfigurator(array(new sfServiceReference('foo.baz'), 'configure'));
+  setConfigurator([new \sfServiceReference('foo.baz'), 'configure']);
 $container->
   register('foo.baz', '%baz_class%')->
   setConstructor('getInstance')->
-  setConfigurator(array('%baz_class%', 'configureStatic1'));
+  setConfigurator(['%baz_class%', 'configureStatic1']);
 $container->register('foo_bar', 'FooClass');
-$container->setParameters(array(
+$container->setParameters([
     'baz_class' => 'BazClass',
     'foo' => 'bar',
-    'foo_bar' => new sfServiceReference('foo_bar'),
-));
+    'foo_bar' => new \sfServiceReference('foo_bar'),
+]);
 $container->setAlias('alias_for_foo', 'foo');
 
 return $container;
diff --git a/test/unit/service/fixtures/includes/classes.php b/test/unit/service/fixtures/includes/classes.php
index f7a3290f7..165975384 100644
--- a/test/unit/service/fixtures/includes/classes.php
+++ b/test/unit/service/fixtures/includes/classes.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 function sc_configure($instance)
 {
     $instance->configure();
diff --git a/test/unit/service/fixtures/includes/foo.php b/test/unit/service/fixtures/includes/foo.php
index c67db482f..090712114 100644
--- a/test/unit/service/fixtures/includes/foo.php
+++ b/test/unit/service/fixtures/includes/foo.php
@@ -1,19 +1,28 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 class FooClass
 {
     public $bar;
     public $initialized = false;
     public $configured = false;
     public $called = false;
-    public $arguments = array();
+    public $arguments = [];
 
-    public function __construct($arguments = array())
+    public function __construct($arguments = [])
     {
         $this->arguments = $arguments;
     }
 
-    public static function getInstance($arguments = array())
+    public static function getInstance($arguments = [])
     {
         $obj = new self($arguments);
         $obj->called = true;
diff --git a/test/unit/service/sfServiceContainerBuilderTest.php b/test/unit/service/sfServiceContainerBuilderTest.php
index 79595468c..4d7462765 100644
--- a/test/unit/service/sfServiceContainerBuilderTest.php
+++ b/test/unit/service/sfServiceContainerBuilderTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,44 +11,44 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(48);
+$t = new \lime_test(48);
 
 // ->setServiceDefinitions() ->addServiceDefinitions() ->getServiceDefinitions() ->setServiceDefinition() ->getServiceDefinition() ->hasServiceDefinition()
 $t->diag('->setServiceDefinitions() ->addServiceDefinitions() ->getServiceDefinitions() ->setServiceDefinition() ->getServiceDefinition() ->hasServiceDefinition()');
-$builder = new sfServiceContainerBuilder();
-$definitions = array(
-    'foo' => new sfServiceDefinition('FooClass'),
-    'bar' => new sfServiceDefinition('BarClass'),
-);
+$builder = new \sfServiceContainerBuilder();
+$definitions = [
+    'foo' => new \sfServiceDefinition('FooClass'),
+    'bar' => new \sfServiceDefinition('BarClass'),
+];
 $builder->setServiceDefinitions($definitions);
 $t->is($builder->getServiceDefinitions(), $definitions, '->setServiceDefinitions() sets the service definitions');
 $t->ok($builder->hasServiceDefinition('foo'), '->hasServiceDefinition() returns true if a service definition exists');
 $t->ok(!$builder->hasServiceDefinition('foobar'), '->hasServiceDefinition() returns false if a service definition does not exist');
 
-$builder->setServiceDefinition('foobar', $foo = new sfServiceDefinition('FooBarClass'));
+$builder->setServiceDefinition('foobar', $foo = new \sfServiceDefinition('FooBarClass'));
 $t->is($builder->getServiceDefinition('foobar'), $foo, '->getServiceDefinition() returns a service definition if defined');
-$t->ok($builder->setServiceDefinition('foobar', $foo = new sfServiceDefinition('FooBarClass')) === $foo, '->setServiceDefinition() implements a fuild interface by returning the service reference');
+$t->ok($builder->setServiceDefinition('foobar', $foo = new \sfServiceDefinition('FooBarClass')) === $foo, '->setServiceDefinition() implements a fuild interface by returning the service reference');
 
-$builder->addServiceDefinitions($defs = array('foobar' => new sfServiceDefinition('FooBarClass')));
+$builder->addServiceDefinitions($defs = ['foobar' => new \sfServiceDefinition('FooBarClass')]);
 $t->is($builder->getServiceDefinitions(), array_merge($definitions, $defs), '->addServiceDefinitions() adds the service definitions');
 
 try {
     $builder->getServiceDefinition('baz');
     $t->fail('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
 }
 
 // ->register()
 $t->diag('->register()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo', 'FooClass');
 $t->ok($builder->hasServiceDefinition('foo'), '->register() registers a new service definition');
-$t->ok($builder->getServiceDefinition('foo') instanceof sfServiceDefinition, '->register() returns the newly created sfServiceDefinition instance');
+$t->ok($builder->getServiceDefinition('foo') instanceof \sfServiceDefinition, '->register() returns the newly created sfServiceDefinition instance');
 
 // ->setAlias()
 $t->diag('->setAlias()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo', 'stdClass');
 $builder->setAlias('bar', 'foo');
 $t->ok($builder->hasService('bar'), '->setAlias() defines a new service');
@@ -55,51 +56,51 @@
 
 // ->getAliases()
 $t->diag('->getAliases()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->setAlias('bar', 'foo');
 $builder->setAlias('foobar', 'foo');
-$t->is($builder->getAliases(), array('bar' => 'foo', 'foobar' => 'foo'), '->getAliases() returns all service aliases');
+$t->is($builder->getAliases(), ['bar' => 'foo', 'foobar' => 'foo'], '->getAliases() returns all service aliases');
 $builder->register('bar', 'stdClass');
-$t->is($builder->getAliases(), array('foobar' => 'foo'), '->getAliases() does not return aliased services that have been overridden');
+$t->is($builder->getAliases(), ['foobar' => 'foo'], '->getAliases() does not return aliased services that have been overridden');
 $builder->setService('foobar', 'stdClass');
-$t->is($builder->getAliases(), array(), '->getAliases() does not return aliased services that have been overridden');
+$t->is($builder->getAliases(), [], '->getAliases() does not return aliased services that have been overridden');
 
 // ->hasService()
 $t->diag('->hasService()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $t->ok(!$builder->hasService('foo'), '->hasService() returns false if the service does not exist');
 $builder->register('foo', 'FooClass');
 $t->ok($builder->hasService('foo'), '->hasService() returns true if a service definition exists');
 $builder->setAlias('foobar', 'foo');
 $t->ok($builder->hasService('foo'), '->hasService() returns true if a service definition exists');
-$builder->setService('bar', new stdClass());
+$builder->setService('bar', new \stdClass());
 $t->ok($builder->hasService('bar'), '->hasService() returns true if a service exists');
 $builder->setAlias('foobar2', 'foo');
 $t->ok($builder->hasService('foobar2'), '->hasService() returns true if a service exists');
 
 // ->getService()
 $t->diag('->getService()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 
 try {
     $builder->getService('foo');
     $t->fail('->getService() throws an InvalidArgumentException if the service does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getService() throws an InvalidArgumentException if the service does not exist');
 }
 $builder->register('foo', 'stdClass');
 $t->ok(is_object($builder->getService('foo')), '->getService() returns the service definition associated with the id');
-$builder->setService('bar', $bar = new stdClass());
+$builder->setService('bar', $bar = new \stdClass());
 $t->is($builder->getService('bar'), $bar, '->getService() returns the service associated with the id');
 $builder->register('bar', 'stdClass');
 $t->is($builder->getService('bar'), $bar, '->getService() returns the service associated with the id even if a definition has been defined');
 
-$builder->register('baz', 'stdClass')->setArguments(array(new sfServiceReference('baz')));
+$builder->register('baz', 'stdClass')->setArguments([new \sfServiceReference('baz')]);
 
 try {
     @$builder->getService('baz');
     $t->fail('->getService() throws a LogicException if the service has a circular reference to itself');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->getService() throws a LogicException if the service has a circular reference to itself');
 }
 
@@ -108,15 +109,15 @@
 
 // ->getServiceIds()
 $t->diag('->getServiceIds()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo', 'stdClass');
-$builder->bar = $bar = new stdClass();
+$builder->bar = $bar = new \stdClass();
 $builder->register('bar', 'stdClass');
-$t->is($builder->getServiceIds(), array('foo', 'bar', 'service_container'), '->getServiceIds() returns all defined service ids');
+$t->is($builder->getServiceIds(), ['foo', 'bar', 'service_container'], '->getServiceIds() returns all defined service ids');
 
 // ->createService() # file
 $t->diag('->createService() # file');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo1', 'FooClass')->setFile(__DIR__.'/fixtures/includes/foo.php');
 $t->ok($builder->getService('foo1'), '->createService() requires the file defined by the service definition');
 $builder->register('foo2', 'FooClass')->setFile(__DIR__.'/fixtures/includes/%file%.php');
@@ -125,49 +126,49 @@
 
 // ->createService() # class
 $t->diag('->createService() # class');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo1', '%class%');
 $builder->setParameter('class', 'stdClass');
-$t->ok($builder->getService('foo1') instanceof stdClass, '->createService() replaces parameters in the class provided by the service definition');
+$t->ok($builder->getService('foo1') instanceof \stdClass, '->createService() replaces parameters in the class provided by the service definition');
 
 // ->createService() # arguments
 $t->diag('->createService() # arguments');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('bar', 'stdClass');
-$builder->register('foo1', 'FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new sfServiceReference('bar')));
+$builder->register('foo1', 'FooClass')->addArgument(['foo' => '%value%', '%value%' => 'foo', new \sfServiceReference('bar')]);
 $builder->setParameter('value', 'bar');
-$t->is($builder->getService('foo1')->arguments, array('foo' => 'bar', 'bar' => 'foo', $builder->getService('bar')), '->createService() replaces parameters and service references in the arguments provided by the service definition');
+$t->is($builder->getService('foo1')->arguments, ['foo' => 'bar', 'bar' => 'foo', $builder->getService('bar')], '->createService() replaces parameters and service references in the arguments provided by the service definition');
 
 // ->createService() # constructor
 $t->diag('->createService() # constructor');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('bar', 'stdClass');
-$builder->register('foo1', 'FooClass')->setConstructor('getInstance')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new sfServiceReference('bar')));
+$builder->register('foo1', 'FooClass')->setConstructor('getInstance')->addArgument(['foo' => '%value%', '%value%' => 'foo', new \sfServiceReference('bar')]);
 $builder->setParameter('value', 'bar');
 $t->ok($builder->getService('foo1')->called, '->createService() calls the constructor to create the service instance');
-$t->is($builder->getService('foo1')->arguments, array('foo' => 'bar', 'bar' => 'foo', $builder->getService('bar')), '->createService() passes the arguments to the constructor');
+$t->is($builder->getService('foo1')->arguments, ['foo' => 'bar', 'bar' => 'foo', $builder->getService('bar')], '->createService() passes the arguments to the constructor');
 
 // ->createService() # method calls
 $t->diag('->createService() # method calls');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('bar', 'stdClass');
-$builder->register('foo1', 'FooClass')->addMethodCall('setBar', array(array('%value%', new sfServiceReference('bar'))));
+$builder->register('foo1', 'FooClass')->addMethodCall('setBar', [['%value%', new \sfServiceReference('bar')]]);
 $builder->setParameter('value', 'bar');
-$t->is($builder->getService('foo1')->bar, array('bar', $builder->getService('bar')), '->createService() replaces the values in the method calls arguments');
+$t->is($builder->getService('foo1')->bar, ['bar', $builder->getService('bar')], '->createService() replaces the values in the method calls arguments');
 
 // ->createService() # configurator
 require_once __DIR__.'/fixtures/includes/classes.php';
 $t->diag('->createService() # configurator');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo1', 'FooClass')->setConfigurator('sc_configure');
 $t->ok($builder->getService('foo1')->configured, '->createService() calls the configurator');
 
-$builder->register('foo2', 'FooClass')->setConfigurator(array('%class%', 'configureStatic'));
+$builder->register('foo2', 'FooClass')->setConfigurator(['%class%', 'configureStatic']);
 $builder->setParameter('class', 'BazClass');
 $t->ok($builder->getService('foo2')->configured, '->createService() calls the configurator');
 
 $builder->register('baz', 'BazClass');
-$builder->register('foo3', 'FooClass')->setConfigurator(array(new sfServiceReference('baz'), 'configure'));
+$builder->register('foo3', 'FooClass')->setConfigurator([new \sfServiceReference('baz'), 'configure']);
 $t->ok($builder->getService('foo3')->configured, '->createService() calls the configurator');
 
 $builder->register('foo4', 'FooClass')->setConfigurator('foo');
@@ -175,13 +176,13 @@
 try {
     $builder->getService('foo4');
     $t->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
 }
 
 // ->resolveValue()
 $t->diag('->resolveValue()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $t->is($builder->resolveValue('foo'), 'foo', '->resolveValue() returns its argument unmodified if no placeholders are found');
 $builder->setParameter('foo', 'bar');
 $t->is($builder->resolveValue('I\'m a %foo%'), 'I\'m a bar', '->resolveValue() replaces placeholders by their values');
@@ -189,9 +190,9 @@
 $t->ok(true === $builder->resolveValue('%foo%'), '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
 
 $builder->setParameter('foo', 'bar');
-$t->is($builder->resolveValue(array('%foo%' => '%foo%')), array('bar' => 'bar'), '->resolveValue() replaces placeholders in keys and values of arrays');
+$t->is($builder->resolveValue(['%foo%' => '%foo%']), ['bar' => 'bar'], '->resolveValue() replaces placeholders in keys and values of arrays');
 
-$t->is($builder->resolveValue(array('%foo%' => array('%foo%' => array('%foo%' => '%foo%')))), array('bar' => array('bar' => array('bar' => 'bar'))), '->resolveValue() replaces placeholders in nested arrays');
+$t->is($builder->resolveValue(['%foo%' => ['%foo%' => ['%foo%' => '%foo%']]]), ['bar' => ['bar' => ['bar' => 'bar']]], '->resolveValue() replaces placeholders in nested arrays');
 
 $t->is($builder->resolveValue('I\'m a %%foo%%'), 'I\'m a %foo%', '->resolveValue() supports % escaping by doubling it');
 $t->is($builder->resolveValue('I\'m a %foo% %%foo %foo%'), 'I\'m a bar %foo bar', '->resolveValue() supports % escaping by doubling it');
@@ -199,20 +200,20 @@
 try {
     $builder->resolveValue('%foobar%');
     $t->fail('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
 }
 
 try {
     $builder->resolveValue('foo %foobar% bar');
     $t->fail('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
 }
 
 // ->resolveServices()
 $t->diag('->resolveServices()');
-$builder = new sfServiceContainerBuilder();
+$builder = new \sfServiceContainerBuilder();
 $builder->register('foo', 'FooClass');
-$t->is($builder->resolveServices(new sfServiceReference('foo')), $builder->getService('foo'), '->resolveServices() resolves service references to service instances');
-$t->is($builder->resolveServices(array('foo' => array('foo', new sfServiceReference('foo')))), array('foo' => array('foo', $builder->getService('foo'))), '->resolveServices() resolves service references to service instances in nested arrays');
+$t->is($builder->resolveServices(new \sfServiceReference('foo')), $builder->getService('foo'), '->resolveServices() resolves service references to service instances');
+$t->is($builder->resolveServices(['foo' => ['foo', new \sfServiceReference('foo')]]), ['foo' => ['foo', $builder->getService('foo')]], '->resolveServices() resolves service references to service instances in nested arrays');
diff --git a/test/unit/service/sfServiceContainerDumperGraphvizTest.php b/test/unit/service/sfServiceContainerDumperGraphvizTest.php
index e00f0ee8a..5483b43fd 100644
--- a/test/unit/service/sfServiceContainerDumperGraphvizTest.php
+++ b/test/unit/service/sfServiceContainerDumperGraphvizTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,34 +11,34 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
 $dir = __DIR__.'/fixtures/graphviz';
 
 // ->dump()
 $t->diag('->dump()');
-$dumper = new sfServiceContainerDumperGraphviz($container = new sfServiceContainerBuilder());
+$dumper = new \sfServiceContainerDumperGraphviz($container = new \sfServiceContainerBuilder());
 
 $t->is($dumper->dump(), file_get_contents($dir.'/services1.dot'), '->dump() dumps an empty container as an empty dot file');
 
-$container = new sfServiceContainerBuilder();
-$dumper = new sfServiceContainerDumperGraphviz($container);
+$container = new \sfServiceContainerBuilder();
+$dumper = new \sfServiceContainerDumperGraphviz($container);
 
 $container = include __DIR__.'/fixtures/containers/container9.php';
-$dumper = new sfServiceContainerDumperGraphviz($container);
+$dumper = new \sfServiceContainerDumperGraphviz($container);
 $t->is($dumper->dump(), str_replace('%path%', __DIR__, file_get_contents($dir.'/services9.dot')), '->dump() dumps services');
 
 $container = include __DIR__.'/fixtures/containers/container10.php';
-$dumper = new sfServiceContainerDumperGraphviz($container);
+$dumper = new \sfServiceContainerDumperGraphviz($container);
 $t->is($dumper->dump(), str_replace('%path%', __DIR__, file_get_contents($dir.'/services10.dot')), '->dump() dumps services');
 
 $container = include __DIR__.'/fixtures/containers/container10.php';
-$dumper = new sfServiceContainerDumperGraphviz($container);
-$t->is($dumper->dump(array(
-    'graph' => array('ratio' => 'normal'),
-    'node' => array('fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'),
-    'edge' => array('fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1),
-    'node.instance' => array('fillcolor' => 'green', 'style' => 'empty'),
-    'node.definition' => array('fillcolor' => 'grey'),
-    'node.missing' => array('fillcolor' => 'red', 'style' => 'empty'),
-)), str_replace('%path%', __DIR__, file_get_contents($dir.'/services10-1.dot')), '->dump() dumps services');
+$dumper = new \sfServiceContainerDumperGraphviz($container);
+$t->is($dumper->dump([
+    'graph' => ['ratio' => 'normal'],
+    'node' => ['fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'],
+    'edge' => ['fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1],
+    'node.instance' => ['fillcolor' => 'green', 'style' => 'empty'],
+    'node.definition' => ['fillcolor' => 'grey'],
+    'node.missing' => ['fillcolor' => 'red', 'style' => 'empty'],
+]), str_replace('%path%', __DIR__, file_get_contents($dir.'/services10-1.dot')), '->dump() dumps services');
diff --git a/test/unit/service/sfServiceContainerDumperPhpTest.php b/test/unit/service/sfServiceContainerDumperPhpTest.php
index 911c5f107..0c84c95b8 100644
--- a/test/unit/service/sfServiceContainerDumperPhpTest.php
+++ b/test/unit/service/sfServiceContainerDumperPhpTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,38 +11,38 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(5);
+$t = new \lime_test(5);
 
 $dir = __DIR__.'/fixtures/php';
 
 // ->dump()
 $t->diag('->dump()');
-$dumper = new sfServiceContainerDumperPhp($container = new sfServiceContainerBuilder());
+$dumper = new \sfServiceContainerDumperPhp($container = new \sfServiceContainerBuilder());
 
 $t->is($dumper->dump(), file_get_contents($dir.'/services1.php'), '->dump() dumps an empty container as an empty PHP class');
-$t->is($dumper->dump(array('class' => 'Container', 'base_class' => 'AbstractContainer')), file_get_contents($dir.'/services1-1.php'), '->dump() takes a class and a base_class options');
+$t->is($dumper->dump(['class' => 'Container', 'base_class' => 'AbstractContainer']), file_get_contents($dir.'/services1-1.php'), '->dump() takes a class and a base_class options');
 
-$container = new sfServiceContainerBuilder();
-$dumper = new sfServiceContainerDumperPhp($container);
+$container = new \sfServiceContainerBuilder();
+$dumper = new \sfServiceContainerDumperPhp($container);
 
 // ->addParameters()
 $t->diag('->addParameters()');
 $container = include __DIR__.'/fixtures/containers/container8.php';
-$dumper = new sfServiceContainerDumperPhp($container);
+$dumper = new \sfServiceContainerDumperPhp($container);
 $t->is($dumper->dump(), file_get_contents($dir.'/services8.php'), '->dump() dumps parameters');
 
 // ->addService()
 $t->diag('->addService()');
 $container = include __DIR__.'/fixtures/containers/container9.php';
-$dumper = new sfServiceContainerDumperPhp($container);
+$dumper = new \sfServiceContainerDumperPhp($container);
 $t->is($dumper->dump(), str_replace('%path%', __DIR__.'/fixtures/includes', file_get_contents($dir.'/services9.php')), '->dump() dumps services');
 
-$dumper = new sfServiceContainerDumperPhp($container = new sfServiceContainerBuilder());
-$container->register('foo', 'FooClass')->addArgument(new stdClass());
+$dumper = new \sfServiceContainerDumperPhp($container = new \sfServiceContainerBuilder());
+$container->register('foo', 'FooClass')->addArgument(new \stdClass());
 
 try {
     $dumper->dump();
     $t->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
 }
diff --git a/test/unit/service/sfServiceContainerDumperTest.php b/test/unit/service/sfServiceContainerDumperTest.php
index b482aa0d3..46e818477 100644
--- a/test/unit/service/sfServiceContainerDumperTest.php
+++ b/test/unit/service/sfServiceContainerDumperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,18 +11,18 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-class ProjectDumper extends sfServiceContainerDumper
+class ProjectDumper extends \sfServiceContainerDumper
 {
 }
 
-$builder = new sfServiceContainerBuilder();
-$dumper = new ProjectDumper($builder);
+$builder = new \sfServiceContainerBuilder();
+$dumper = new \ProjectDumper($builder);
 
 try {
     $dumper->dump();
     $t->fail('->dump() returns a LogicException if the dump() method has not been overriden by a children class');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->dump() returns a LogicException if the dump() method has not been overriden by a children class');
 }
diff --git a/test/unit/service/sfServiceContainerLoaderArrayTest.php b/test/unit/service/sfServiceContainerLoaderArrayTest.php
index e624e126f..38daa4909 100644
--- a/test/unit/service/sfServiceContainerLoaderArrayTest.php
+++ b/test/unit/service/sfServiceContainerLoaderArrayTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(20);
+$t = new \lime_test(20);
 
-class ProjectLoader extends sfServiceContainerLoaderArray
+class ProjectLoader extends \sfServiceContainerLoaderArray
 {
     public function validate($content)
     {
@@ -20,38 +21,38 @@ public function validate($content)
     }
 }
 
-$loader = new ProjectLoader(null);
+$loader = new \ProjectLoader(null);
 
 // ->validate()
 try {
-    $loader->validate(sfYaml::load(__DIR__.'/fixtures/yaml/nonvalid1.yml'));
+    $loader->validate(\sfYaml::load(__DIR__.'/fixtures/yaml/nonvalid1.yml'));
     $t->fail('->validate() throws an InvalidArgumentException if the loaded definition is not an array');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not an array');
 }
 
 try {
-    $loader->validate(sfYaml::load(__DIR__.'/fixtures/yaml/nonvalid2.yml'));
+    $loader->validate(\sfYaml::load(__DIR__.'/fixtures/yaml/nonvalid2.yml'));
     $t->fail('->validate() throws an InvalidArgumentException if the loaded definition is not a valid array');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not a valid array');
 }
 
 // ->load() # parameters
 $t->diag('->load() # parameters');
 
-list($services, $parameters) = $loader->doLoad(array());
-$t->is($parameters, array(), '->load() return emty parameters array for an empty array definition');
+list($services, $parameters) = $loader->doLoad([]);
+$t->is($parameters, [], '->load() return emty parameters array for an empty array definition');
 
-list($services, $parameters) = $loader->doLoad(sfYaml::load(__DIR__.'/fixtures/yaml/services2.yml'));
-$t->is($parameters, array('foo' => 'bar', 'values' => array(true, false, 0, 1000.3), 'bar' => 'foo', 'foo_bar' => new sfServiceReference('foo_bar')), '->load() converts array keys to lowercase');
+list($services, $parameters) = $loader->doLoad(\sfYaml::load(__DIR__.'/fixtures/yaml/services2.yml'));
+$t->is($parameters, ['foo' => 'bar', 'values' => [true, false, 0, 1000.3], 'bar' => 'foo', 'foo_bar' => new \sfServiceReference('foo_bar')], '->load() converts array keys to lowercase');
 
 // ->load() # services
-list($services, $parameters) = $loader->doLoad(sfYaml::load(__DIR__.'/fixtures/yaml/services2.yml'));
-$t->is($services, array(), '->load() return emty services array for an empty array definition');
+list($services, $parameters) = $loader->doLoad(\sfYaml::load(__DIR__.'/fixtures/yaml/services2.yml'));
+$t->is($services, [], '->load() return emty services array for an empty array definition');
 
 $t->diag('->load() # services');
-list($services, $parameters) = $loader->doLoad(sfYaml::load(__DIR__.'/fixtures/yaml/services3.yml'));
+list($services, $parameters) = $loader->doLoad(\sfYaml::load(__DIR__.'/fixtures/yaml/services3.yml'));
 $t->ok(isset($services['foo']), '->load() parses service elements');
 $t->is(get_class($services['foo']), 'sfServiceDefinition', '->load() converts service element to sfServiceDefinition instances');
 $t->is($services['foo']->getClass(), 'FooClass', '->load() parses the class attribute');
@@ -59,11 +60,11 @@ public function validate($content)
 $t->ok(!$services['non_shared']->isShared(), '->load() parses the shared attribute');
 $t->is($services['constructor']->getConstructor(), 'getInstance', '->load() parses the constructor attribute');
 $t->is($services['file']->getFile(), '%path%/foo.php', '->load() parses the file tag');
-$t->is($services['arguments']->getArguments(), array('foo', new sfServiceReference('foo'), array(true, false)), '->load() parses the argument tags');
+$t->is($services['arguments']->getArguments(), ['foo', new \sfServiceReference('foo'), [true, false]], '->load() parses the argument tags');
 $t->is($services['configurator1']->getConfigurator(), 'sc_configure', '->load() parses the configurator tag');
-$t->is($services['configurator2']->getConfigurator(), array(new sfServiceReference('baz'), 'configure'), '->load() parses the configurator tag');
-$t->is($services['configurator3']->getConfigurator(), array('BazClass', 'configureStatic'), '->load() parses the configurator tag');
-$t->is($services['method_call1']->getMethodCalls(), array(array('setBar', array())), '->load() parses the method_call tag');
-$t->is($services['method_call2']->getMethodCalls(), array(array('setBar', array('foo', new sfServiceReference('foo'), array(true, false)))), '->load() parses the method_call tag');
+$t->is($services['configurator2']->getConfigurator(), [new \sfServiceReference('baz'), 'configure'], '->load() parses the configurator tag');
+$t->is($services['configurator3']->getConfigurator(), ['BazClass', 'configureStatic'], '->load() parses the configurator tag');
+$t->is($services['method_call1']->getMethodCalls(), [['setBar', []]], '->load() parses the method_call tag');
+$t->is($services['method_call2']->getMethodCalls(), [['setBar', ['foo', new \sfServiceReference('foo'), [true, false]]]], '->load() parses the method_call tag');
 $t->ok(isset($services['alias_for_foo']), '->load() parses aliases');
 $t->is($services['alias_for_foo'], 'foo', '->load() parses aliases');
diff --git a/test/unit/service/sfServiceContainerLoaderTest.php b/test/unit/service/sfServiceContainerLoaderTest.php
index e1526d56d..a95f79193 100644
--- a/test/unit/service/sfServiceContainerLoaderTest.php
+++ b/test/unit/service/sfServiceContainerLoaderTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
-class ProjectLoader extends sfServiceContainerLoader
+class ProjectLoader extends \sfServiceContainerLoader
 {
     public $container;
 
@@ -24,54 +25,54 @@ public function doLoad($resource)
 
 // __construct()
 $t->diag('__construct()');
-$loader = new ProjectLoader($container = new sfServiceContainerBuilder());
+$loader = new \ProjectLoader($container = new \sfServiceContainerBuilder());
 $t->is($loader->container, $container, '__construct() takes a container builder instance as its first argument');
 
 // ->setServiceContainer()
 $t->diag('->setServiceContainer()');
-$loader = new ProjectLoader();
-$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$loader = new \ProjectLoader();
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder());
 $t->is($loader->container, $container, '->setServiceContainer() sets the container builder attached to this loader');
 
 // ->load()
 $t->diag('->load()');
-$loader = new ProjectLoader();
+$loader = new \ProjectLoader();
 
 try {
     $loader->load('foo');
     $t->fail('->load() throws a LogicException if no container is attached to the loader');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->load() throws a LogicException if no container is attached to the loader');
 }
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo')));
-$loader->load(array(array(), array('foo' => 'bar')));
-$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'bar'), '->load() merges current parameters with the loaded ones');
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder(['bar' => 'foo']));
+$loader->load([[], ['foo' => 'bar']]);
+$t->is($container->getParameters(), ['bar' => 'foo', 'foo' => 'bar'], '->load() merges current parameters with the loaded ones');
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo', 'foo' => 'baz')));
-$loader->load(array(array(), array('foo' => 'bar')));
-$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'baz'), '->load() does not change the already defined parameters');
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder(['bar' => 'foo', 'foo' => 'baz']));
+$loader->load([[], ['foo' => 'bar']]);
+$t->is($container->getParameters(), ['bar' => 'foo', 'foo' => 'baz'], '->load() does not change the already defined parameters');
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo')));
-$loader->load(array(array(), array('foo' => '%bar%')));
-$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'foo'), '->load() evaluates the values of the parameters towards already defined ones');
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder(['bar' => 'foo']));
+$loader->load([[], ['foo' => '%bar%']]);
+$t->is($container->getParameters(), ['bar' => 'foo', 'foo' => 'foo'], '->load() evaluates the values of the parameters towards already defined ones');
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo')));
-$loader->load(array(array(), array('foo' => '%bar%', 'baz' => '%foo%')));
-$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'), '->load() evaluates the values of the parameters towards already defined ones');
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder(['bar' => 'foo']));
+$loader->load([[], ['foo' => '%bar%', 'baz' => '%foo%']]);
+$t->is($container->getParameters(), ['bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'], '->load() evaluates the values of the parameters towards already defined ones');
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder());
 $container->register('foo', 'FooClass');
 $container->register('bar', 'BarClass');
-$loader->load(array(array('baz' => new sfServiceDefinition('BazClass'), 'alias_for_foo' => 'foo'), array()));
-$t->is(array_keys($container->getServiceDefinitions()), array('foo', 'bar', 'baz'), '->load() merges definitions already defined ones');
-$t->is($container->getAliases(), array('alias_for_foo' => 'foo'), '->load() registers defined aliases');
+$loader->load([['baz' => new \sfServiceDefinition('BazClass'), 'alias_for_foo' => 'foo'], []]);
+$t->is(array_keys($container->getServiceDefinitions()), ['foo', 'bar', 'baz'], '->load() merges definitions already defined ones');
+$t->is($container->getAliases(), ['alias_for_foo' => 'foo'], '->load() registers defined aliases');
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder());
 $container->register('foo', 'FooClass');
-$loader->load(array(array('foo' => new sfServiceDefinition('BazClass')), array()));
+$loader->load([['foo' => new \sfServiceDefinition('BazClass')], []]);
 $t->is($container->getServiceDefinition('foo')->getClass(), 'BazClass', '->load() overrides already defined services');
 
-$loader->setServiceContainer($container = new sfServiceContainerBuilder());
-$loader->load(array(array(), array('foo' => 'bar')), array(array(), array('bar' => 'foo')));
-$t->is($container->getParameters(), array('foo' => 'bar', 'bar' => 'foo'), '->load() accepts several resources as argument');
+$loader->setServiceContainer($container = new \sfServiceContainerBuilder());
+$loader->load([[], ['foo' => 'bar']], [[], ['bar' => 'foo']]);
+$t->is($container->getParameters(), ['foo' => 'bar', 'bar' => 'foo'], '->load() accepts several resources as argument');
diff --git a/test/unit/service/sfServiceContainerTest.php b/test/unit/service/sfServiceContainerTest.php
index a4c8f0ec7..219576782 100644
--- a/test/unit/service/sfServiceContainerTest.php
+++ b/test/unit/service/sfServiceContainerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,35 +11,35 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(27);
+$t = new \lime_test(27);
 
 // __construct()
 $t->diag('__construct()');
-$sc = new sfServiceContainer();
+$sc = new \sfServiceContainer();
 $t->is(spl_object_hash($sc->getService('service_container')), spl_object_hash($sc), '__construct() automatically registers itself as a service');
 
-$sc = new sfServiceContainer(array('foo' => 'bar'));
-$t->is($sc->getParameters(), array('foo' => 'bar'), '__construct() takes an array of parameters as its first argument');
+$sc = new \sfServiceContainer(['foo' => 'bar']);
+$t->is($sc->getParameters(), ['foo' => 'bar'], '__construct() takes an array of parameters as its first argument');
 
 // ->setParameters() ->getParameters()
 $t->diag('->setParameters() ->getParameters()');
 
-$sc = new sfServiceContainer();
-$t->is($sc->getParameters(), array(), '->getParameters() returns an empty array if no parameter has been defined');
+$sc = new \sfServiceContainer();
+$t->is($sc->getParameters(), [], '->getParameters() returns an empty array if no parameter has been defined');
 
-$sc->setParameters(array('foo' => 'bar'));
-$t->is($sc->getParameters(), array('foo' => 'bar'), '->setParameters() sets the parameters');
+$sc->setParameters(['foo' => 'bar']);
+$t->is($sc->getParameters(), ['foo' => 'bar'], '->setParameters() sets the parameters');
 
-$sc->setParameters(array('bar' => 'foo'));
-$t->is($sc->getParameters(), array('bar' => 'foo'), '->setParameters() overrides the previous defined parameters');
+$sc->setParameters(['bar' => 'foo']);
+$t->is($sc->getParameters(), ['bar' => 'foo'], '->setParameters() overrides the previous defined parameters');
 
-$sc->setParameters(array('Bar' => 'foo'));
-$t->is($sc->getParameters(), array('bar' => 'foo'), '->setParameters() converts the key to lowercase');
+$sc->setParameters(['Bar' => 'foo']);
+$t->is($sc->getParameters(), ['bar' => 'foo'], '->setParameters() converts the key to lowercase');
 
 // ->setParameter() ->getParameter()
 $t->diag('->setParameter() ->getParameter() ');
 
-$sc = new sfServiceContainer(array('foo' => 'bar'));
+$sc = new \sfServiceContainer(['foo' => 'bar']);
 $sc->setParameter('bar', 'foo');
 $t->is($sc->getParameter('bar'), 'foo', '->setParameter() sets the value of a new parameter');
 $t->is($sc->getParameter('bar'), 'foo', '->getParameter() gets the value of a parameter');
@@ -53,43 +54,43 @@
 try {
     $sc->getParameter('baba');
     $t->fail('->getParameter() thrown an InvalidArgumentException if the key does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getParameter() thrown an InvalidArgumentException if the key does not exist');
 }
 
 // ->hasParameter()
 $t->diag('->hasParameter()');
-$sc = new sfServiceContainer(array('foo' => 'bar'));
+$sc = new \sfServiceContainer(['foo' => 'bar']);
 $t->ok($sc->hasParameter('foo'), '->hasParameter() returns true if a parameter is defined');
 $t->ok($sc->hasParameter('Foo'), '->hasParameter() converts the key to lowercase');
 $t->ok(!$sc->hasParameter('bar'), '->hasParameter() returns false if a parameter is not defined');
 
 // ->addParameters()
 $t->diag('->addParameters()');
-$sc = new sfServiceContainer(array('foo' => 'bar'));
-$sc->addParameters(array('bar' => 'foo'));
-$t->is($sc->getParameters(), array('foo' => 'bar', 'bar' => 'foo'), '->addParameters() adds parameters to the existing ones');
-$sc->addParameters(array('Bar' => 'fooz'));
-$t->is($sc->getParameters(), array('foo' => 'bar', 'bar' => 'fooz'), '->addParameters() converts keys to lowercase');
+$sc = new \sfServiceContainer(['foo' => 'bar']);
+$sc->addParameters(['bar' => 'foo']);
+$t->is($sc->getParameters(), ['foo' => 'bar', 'bar' => 'foo'], '->addParameters() adds parameters to the existing ones');
+$sc->addParameters(['Bar' => 'fooz']);
+$t->is($sc->getParameters(), ['foo' => 'bar', 'bar' => 'fooz'], '->addParameters() converts keys to lowercase');
 
 // ->setService() ->hasService() ->getService()
 $t->diag('->setService() ->hasService() ->getService()');
-$sc = new sfServiceContainer();
-$sc->setService('foo', $obj = new stdClass());
+$sc = new \sfServiceContainer();
+$sc->setService('foo', $obj = new \stdClass());
 $t->is(spl_object_hash($sc->getService('foo')), spl_object_hash($obj), '->setService() registers a service under a key name');
 
-$sc->foo1 = $obj1 = new stdClass();
+$sc->foo1 = $obj1 = new \stdClass();
 $t->ok($sc->hasService('foo'), '->hasService() returns true if the service is defined');
 $t->ok(!$sc->hasService('bar'), '->hasService() returns false if the service is not defined');
 
 // ->getServiceIds()
 $t->diag('->getServiceIds()');
-$sc = new sfServiceContainer();
-$sc->setService('foo', $obj = new stdClass());
-$sc->setService('bar', $obj = new stdClass());
-$t->is($sc->getServiceIds(), array('service_container', 'foo', 'bar'), '->getServiceIds() returns all defined service ids');
+$sc = new \sfServiceContainer();
+$sc->setService('foo', $obj = new \stdClass());
+$sc->setService('bar', $obj = new \stdClass());
+$t->is($sc->getServiceIds(), ['service_container', 'foo', 'bar'], '->getServiceIds() returns all defined service ids');
 
-class ProjectServiceContainer extends sfServiceContainer
+class ProjectServiceContainer extends \sfServiceContainer
 {
     public $__bar;
     public $__foo_bar;
@@ -99,9 +100,9 @@ public function __construct()
     {
         parent::__construct();
 
-        $this->__bar = new stdClass();
-        $this->__foo_bar = new stdClass();
-        $this->__foo_baz = new stdClass();
+        $this->__bar = new \stdClass();
+        $this->__foo_bar = new \stdClass();
+        $this->__foo_baz = new \stdClass();
     }
 
     protected function getBarService()
@@ -120,17 +121,17 @@ protected function getFoo_BazService()
     }
 }
 
-$sc = new ProjectServiceContainer();
+$sc = new \ProjectServiceContainer();
 $t->is(spl_object_hash($sc->getService('bar')), spl_object_hash($sc->__bar), '->getService() looks for a getXXXService() method');
 $t->ok($sc->hasService('bar'), '->hasService() returns true if the service has been defined as a getXXXService() method');
 
-$sc->setService('bar', $bar = new stdClass());
+$sc->setService('bar', $bar = new \stdClass());
 $t->is(spl_object_hash($sc->getService('bar')), spl_object_hash($bar), '->getService() prefers to return a service defined with setService() than one defined with a getXXXService() method');
 
 try {
     $sc->getService('baba');
     $t->fail('->getService() thrown an InvalidArgumentException if the service does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getService() thrown an InvalidArgumentException if the service does not exist');
 }
 
diff --git a/test/unit/service/sfServiceDefinitionTest.php b/test/unit/service/sfServiceDefinitionTest.php
index dd0a5170c..63f54d149 100644
--- a/test/unit/service/sfServiceDefinitionTest.php
+++ b/test/unit/service/sfServiceDefinitionTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,60 +11,60 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(21);
+$t = new \lime_test(21);
 
 // __construct()
 $t->diag('__construct()');
 
-$def = new sfServiceDefinition('stdClass');
+$def = new \sfServiceDefinition('stdClass');
 $t->is($def->getClass(), 'stdClass', '__construct() takes the class name as its first argument');
 
-$def = new sfServiceDefinition('stdClass', array('foo'));
-$t->is($def->getArguments(), array('foo'), '__construct() takes an optional array of arguments as its second argument');
+$def = new \sfServiceDefinition('stdClass', ['foo']);
+$t->is($def->getArguments(), ['foo'], '__construct() takes an optional array of arguments as its second argument');
 
 // ->setConstructor() ->getConstructor()
 $t->diag('->setConstructor() ->getConstructor()');
-$def = new sfServiceDefinition('stdClass');
+$def = new \sfServiceDefinition('stdClass');
 $t->is(spl_object_hash($def->setConstructor('foo')), spl_object_hash($def), '->setConstructor() implements a fluent interface');
 $t->is($def->getConstructor(), 'foo', '->getConstructor() returns the constructor name');
 
 // ->setClass() ->getClass()
 $t->diag('->setClass() ->getClass()');
-$def = new sfServiceDefinition('stdClass');
+$def = new \sfServiceDefinition('stdClass');
 $t->is(spl_object_hash($def->setClass('foo')), spl_object_hash($def), '->setClass() implements a fluent interface');
 $t->is($def->getClass(), 'foo', '->getClass() returns the class name');
 
 // ->setArguments() ->getArguments() ->addArgument()
 $t->diag('->setArguments() ->getArguments() ->addArgument()');
-$def = new sfServiceDefinition('stdClass');
-$t->is(spl_object_hash($def->setArguments(array('foo'))), spl_object_hash($def), '->setArguments() implements a fluent interface');
-$t->is($def->getArguments(), array('foo'), '->getArguments() returns the arguments');
+$def = new \sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setArguments(['foo'])), spl_object_hash($def), '->setArguments() implements a fluent interface');
+$t->is($def->getArguments(), ['foo'], '->getArguments() returns the arguments');
 $t->is(spl_object_hash($def->addArgument('bar')), spl_object_hash($def), '->addArgument() implements a fluent interface');
-$t->is($def->getArguments(), array('foo', 'bar'), '->addArgument() adds an argument');
+$t->is($def->getArguments(), ['foo', 'bar'], '->addArgument() adds an argument');
 
 // ->setMethodCalls() ->getMethodCalls() ->addMethodCall()
 $t->diag('->setMethodCalls() ->getMethodCalls() ->addMethodCall()');
-$def = new sfServiceDefinition('stdClass');
-$t->is(spl_object_hash($def->setMethodCalls(array(array('foo', array('foo'))))), spl_object_hash($def), '->setMethodCalls() implements a fluent interface');
-$t->is($def->getMethodCalls(), array(array('foo', array('foo'))), '->getMethodCalls() returns the methods to call');
-$t->is(spl_object_hash($def->addMethodCall('bar', array('bar'))), spl_object_hash($def), '->addMethodCall() implements a fluent interface');
-$t->is($def->getMethodCalls(), array(array('foo', array('foo')), array('bar', array('bar'))), '->addMethodCall() adds a method to call');
+$def = new \sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setMethodCalls([['foo', ['foo']]])), spl_object_hash($def), '->setMethodCalls() implements a fluent interface');
+$t->is($def->getMethodCalls(), [['foo', ['foo']]], '->getMethodCalls() returns the methods to call');
+$t->is(spl_object_hash($def->addMethodCall('bar', ['bar'])), spl_object_hash($def), '->addMethodCall() implements a fluent interface');
+$t->is($def->getMethodCalls(), [['foo', ['foo']], ['bar', ['bar']]], '->addMethodCall() adds a method to call');
 
 // ->setFile() ->getFile()
 $t->diag('->setFile() ->getFile()');
-$def = new sfServiceDefinition('stdClass');
+$def = new \sfServiceDefinition('stdClass');
 $t->is(spl_object_hash($def->setFile('foo')), spl_object_hash($def), '->setFile() implements a fluent interface');
 $t->is($def->getFile(), 'foo', '->getFile() returns the file to include');
 
 // ->setShared() ->isShared()
 $t->diag('->setShared() ->isShared()');
-$def = new sfServiceDefinition('stdClass');
+$def = new \sfServiceDefinition('stdClass');
 $t->is($def->isShared(), true, '->isShared() returns true by default');
 $t->is(spl_object_hash($def->setShared(false)), spl_object_hash($def), '->setShared() implements a fluent interface');
 $t->is($def->isShared(), false, '->isShared() returns false if the instance must not be shared');
 
 // ->setConfigurator() ->getConfigurator()
 $t->diag('->setConfigurator() ->getConfigurator()');
-$def = new sfServiceDefinition('stdClass');
+$def = new \sfServiceDefinition('stdClass');
 $t->is(spl_object_hash($def->setConfigurator('foo')), spl_object_hash($def), '->setConfigurator() implements a fluent interface');
 $t->is($def->getConfigurator(), 'foo', '->getConfigurator() returns the configurator');
diff --git a/test/unit/service/sfServiceParameterTest.php b/test/unit/service/sfServiceParameterTest.php
index b8bc55fc4..5be7a5b33 100644
--- a/test/unit/service/sfServiceParameterTest.php
+++ b/test/unit/service/sfServiceParameterTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,10 +11,10 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // __construct() ->__toString()
 $t->diag('__construct() ->__toString()');
 
-$ref = new sfServiceParameter('foo');
+$ref = new \sfServiceParameter('foo');
 $t->is((string) $ref, 'foo', '__construct() sets the id of the parameter, which is used for the __toString() method');
diff --git a/test/unit/service/sfServiceReferenceTest.php b/test/unit/service/sfServiceReferenceTest.php
index 176ba263b..baf678f3b 100644
--- a/test/unit/service/sfServiceReferenceTest.php
+++ b/test/unit/service/sfServiceReferenceTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,10 +11,10 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // __construct() ->__toString()
 $t->diag('__construct() ->__toString()');
 
-$ref = new sfServiceReference('foo');
+$ref = new \sfServiceReference('foo');
 $t->is((string) $ref, 'foo', '__construct() sets the id of the reference, which is used for the __toString() method');
diff --git a/test/unit/sfContextMock.class.php b/test/unit/sfContextMock.class.php
index 97d67a8bd..9b673c97e 100644
--- a/test/unit/sfContextMock.class.php
+++ b/test/unit/sfContextMock.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,18 +24,18 @@ class sfContext
 
     public function __destruct()
     {
-        sfToolkit::clearDirectory($this->sessionPath);
+        \sfToolkit::clearDirectory($this->sessionPath);
     }
 
-    public static function getInstance($factories = array(), $force = false)
+    public static function getInstance($factories = [], $force = false)
     {
         if (!isset(self::$instance) || $force) {
-            self::$instance = new sfContext();
+            self::$instance = new \sfContext();
 
             self::$instance->sessionPath = sys_get_temp_dir().'/sessions_'.rand(11111, 99999);
-            self::$instance->storage = new sfSessionTestStorage(array('session_path' => self::$instance->sessionPath));
+            self::$instance->storage = new \sfSessionTestStorage(['session_path' => self::$instance->sessionPath]);
 
-            self::$instance->dispatcher = new sfEventDispatcher();
+            self::$instance->dispatcher = new \sfEventDispatcher();
 
             foreach ($factories as $type => $class) {
                 self::$instance->inject($type, $class);
@@ -99,7 +100,7 @@ public function getController()
         return $this->controller;
     }
 
-    public function inject($type, $class, $parameters = array())
+    public function inject($type, $class, $parameters = [])
     {
         switch ($type) {
             case 'routing':
diff --git a/test/unit/sfEventDispatcherTest.class.php b/test/unit/sfEventDispatcherTest.class.php
index c65769463..d901bdc74 100644
--- a/test/unit/sfEventDispatcherTest.class.php
+++ b/test/unit/sfEventDispatcherTest.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,13 +22,13 @@ public function __construct($testObject)
     public function launchTests($dispatcher, $object, $class)
     {
         $this->t->diag('New methods via sfEventDispatcher');
-        $dispatcher->connect($class.'.method_not_found', array('myEventDispatcherTest', 'newMethod'));
+        $dispatcher->connect($class.'.method_not_found', ['myEventDispatcherTest', 'newMethod']);
         $this->t->is($object->newMethod('ok'), 'ok', '__call() accepts new methods via sfEventDispatcher');
 
         try {
             $object->nonexistantmethodname();
             $this->t->fail('__call() throws an exception if the method does not exist as a sfEventDispatcher listener');
-        } catch (sfException $e) {
+        } catch (\sfException $e) {
             $this->t->pass('__call() throws an exception if the method does not exist as a sfEventDispatcher listener');
         }
     }
@@ -35,7 +36,7 @@ public function launchTests($dispatcher, $object, $class)
 
 class myEventDispatcherTest
 {
-    public static function newMethod(sfEvent $event)
+    public static function newMethod(\sfEvent $event)
     {
         if ('newMethod' == $event['method']) {
             $arguments = $event['arguments'];
diff --git a/test/unit/sfNoRouting.class.php b/test/unit/sfNoRouting.class.php
index 72ec9de9a..1fd0397b3 100644
--- a/test/unit/sfNoRouting.class.php
+++ b/test/unit/sfNoRouting.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +16,10 @@
  *
  * @version    SVN: $Id: sfNoRouting.class.php 20566 2009-07-29 07:04:01Z fabien $
  */
-class sfNoRouting extends sfRouting
+class sfNoRouting extends \sfRouting
 {
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function getCurrentInternalUri($with_route_name = false)
     {
@@ -34,9 +35,9 @@ public function getCurrentInternalUri($with_route_name = false)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
-    public function generate($name, $params = array(), $absolute = false)
+    public function generate($name, $params = [], $absolute = false)
     {
         $parameters = $this->mergeArrays($this->defaultParameters, $params);
         if ($this->getDefaultParameter('module') == $parameters['module']) {
@@ -52,23 +53,23 @@ public function generate($name, $params = array(), $absolute = false)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function parse($url)
     {
-        return array();
+        return [];
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function getRoutes()
     {
-        return array();
+        return [];
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function getRoute($name)
     {
@@ -76,15 +77,15 @@ public function getRoute($name)
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function setRoutes($routes)
     {
-        return array();
+        return [];
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function hasRoutes()
     {
@@ -92,7 +93,7 @@ public function hasRoutes()
     }
 
     /**
-     * @see sfRouting
+     * @see \sfRouting
      */
     public function clearRoutes()
     {
diff --git a/test/unit/sfParameterHolderTest.class.php b/test/unit/sfParameterHolderTest.class.php
index e22377426..b91928e20 100644
--- a/test/unit/sfParameterHolderTest.class.php
+++ b/test/unit/sfParameterHolderTest.class.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,7 +30,7 @@ public function launchTests($object, $methodName = 'parameter')
 
         $t->diag(ucfirst($methodName).' holder proxy');
 
-        $namespaced = $object->{$holderMethod}() instanceof sfNamespacedParameterHolder ? true : false;
+        $namespaced = $object->{$holderMethod}() instanceof \sfNamespacedParameterHolder ? true : false;
 
         $t->isa_ok($object->{$holderMethod}(), $namespaced ? 'sfNamespacedParameterHolder' : 'sfParameterHolder', "->{$holderMethod}() returns a parameter holder instance");
         $t->is($object->{$hasMethod}('foo'), false, "->{$hasMethod}() returns false if the {$methodName} does not exist");
diff --git a/test/unit/storage/sfCacheSessionStorageTest.php b/test/unit/storage/sfCacheSessionStorageTest.php
index 2e2329b11..89c9b6452 100644
--- a/test/unit/storage/sfCacheSessionStorageTest.php
+++ b/test/unit/storage/sfCacheSessionStorageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,7 +19,7 @@
 
 require_once $_test_dir.'/../lib/vendor/lime/lime.php';
 
-sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
+\sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
 
 // setup cache
 $temp = tempnam('/tmp/cache_dir', 'tmp');
@@ -26,18 +27,18 @@
 mkdir($temp);
 
 $plan = 8;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 // initialize the storage
 try {
-    $storage = new sfCacheSessionStorage();
+    $storage = new \sfCacheSessionStorage();
     $t->fail('->__construct() does not throw an exception when not provided a cache option');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->__construct() throws an exception when not provided a cache option');
 }
 
-$storage = new sfCacheSessionStorage(array('cache' => array('class' => 'sfFileCache', 'param' => array('cache_dir' => $temp))));
-$t->ok($storage instanceof sfStorage, '->__construct() is an instance of sfStorage');
+$storage = new \sfCacheSessionStorage(['cache' => ['class' => 'sfFileCache', 'param' => ['cache_dir' => $temp]]]);
+$t->ok($storage instanceof \sfStorage, '->__construct() is an instance of sfStorage');
 
 $storage->write('test', 123);
 
@@ -64,5 +65,5 @@
 $storage->shutdown();
 
 // clean up cache
-sfToolkit::clearDirectory($temp);
+\sfToolkit::clearDirectory($temp);
 rmdir($temp);
diff --git a/test/unit/storage/sfMySQLStorageTest.php b/test/unit/storage/sfMySQLStorageTest.php
index 8d2639de8..b52b7de83 100644
--- a/test/unit/storage/sfMySQLStorageTest.php
+++ b/test/unit/storage/sfMySQLStorageTest.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2008 Dejan Spasic <spasic.dejan@yahoo.de>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,7 @@
 
 ob_start();
 $plan = 16;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!extension_loaded('mysql')) {
     $t->skip('Mysql extension must be loaded', $plan);
@@ -22,10 +22,10 @@
 }
 
 // Configure your database with the settings below in order to run the test
-$mysql_config = array(
+$mysql_config = [
     'host' => 'localhost',
     'username' => 'root',
-    'password' => '', );
+    'password' => '', ];
 
 if (!isset($mysql_config)) {
     $t->skip('Mysql credentials needed to run these tests', $plan);
@@ -35,9 +35,9 @@
 
 try {
     // Creating mysql database connection
-    $database = new sfMySQLDatabase($mysql_config);
+    $database = new \sfMySQLDatabase($mysql_config);
     $connection = $database->getResource();
-} catch (sfDatabaseException $e) {
+} catch (\sfDatabaseException $e) {
     $t->diag($e->getMessage());
     $t->skip('Unable to connect to MySQL database, skipping', $plan);
 
@@ -58,15 +58,15 @@
 ini_set('session.use_cookies', 0);
 $session_id = '1';
 
-$storage = new sfMySQLSessionStorage(
-    array(
+$storage = new \sfMySQLSessionStorage(
+    [
         'db_table' => 'session',
         'session_id' => $session_id,
-        'database' => $database)
+        'database' => $database]
 );
 
-$t->ok($storage instanceof sfStorage, 'sfMySQLSessionStorage is an instance of sfStorage');
-$t->ok($storage instanceof sfDatabaseSessionStorage, 'sfMySQLSessionStorage is an instance of sfDatabaseSessionStorage');
+$t->ok($storage instanceof \sfStorage, 'sfMySQLSessionStorage is an instance of sfStorage');
+$t->ok($storage instanceof \sfDatabaseSessionStorage, 'sfMySQLSessionStorage is an instance of sfDatabaseSessionStorage');
 
 // regenerate()
 $oldSessionData = 'foo:bar';
@@ -104,7 +104,7 @@
 try {
     $retrieved_data = $storage->sessionRead($session_id);
     $t->pass('sessionRead() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionRead() does not throw an exception');
 }
 $t->is($retrieved_data, $newSessionData, 'sessionRead() reads session data');
@@ -115,7 +115,7 @@
 try {
     $write = $storage->sessionWrite($session_id, $otherSessionData);
     $t->pass('sessionWrite() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionWrite() does not throw an exception');
 }
 
@@ -126,7 +126,7 @@
 try {
     $storage->sessionDestroy($session_id);
     $t->pass('sessionDestroy() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionDestroy() does not throw an exception');
 }
 
diff --git a/test/unit/storage/sfMySQLiStorageTest.php b/test/unit/storage/sfMySQLiStorageTest.php
index 062a0f2c2..dc1a4ff14 100644
--- a/test/unit/storage/sfMySQLiStorageTest.php
+++ b/test/unit/storage/sfMySQLiStorageTest.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2008 Dejan Spasic <spasic.dejan@yahoo.de>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,7 @@
 
 ob_start();
 $plan = 12;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!extension_loaded('mysqli')) {
     $t->skip('Mysqli extension must be loaded', $plan);
@@ -22,10 +22,10 @@
 }
 
 // Configure your database with the settings below in order to run the test
-$mysqli_config = array(
+$mysqli_config = [
     'host' => 'localhost',
     'username' => 'root',
-    'password' => '', );
+    'password' => '', ];
 
 if (!isset($mysqli_config)) {
     $t->skip('Mysql credentials needed to run these tests', $plan);
@@ -35,9 +35,9 @@
 
 try {
     // Creating mysql database connection
-    $database = new sfMySQLiDatabase($mysqli_config);
+    $database = new \sfMySQLiDatabase($mysqli_config);
     $connection = $database->getResource();
-} catch (sfDatabaseException $e) {
+} catch (\sfDatabaseException $e) {
     $t->diag($e->getMessage());
     $t->skip('Unable to connect to MySQL database, skipping', $plan);
 
@@ -58,15 +58,15 @@
 ini_set('session.use_cookies', 0);
 $session_id = '1';
 
-$storage = new sfMySQLiSessionStorage(
-    array(
+$storage = new \sfMySQLiSessionStorage(
+    [
         'db_table' => 'session',
         'session_id' => $session_id,
-        'database' => $database)
+        'database' => $database]
 );
 
-$t->ok($storage instanceof sfStorage, 'sfMySQLSessionStorage is an instance of sfStorage');
-$t->ok($storage instanceof sfDatabaseSessionStorage, 'sfMySQLSessionStorage is an instance of sfDatabaseSessionStorage');
+$t->ok($storage instanceof \sfStorage, 'sfMySQLSessionStorage is an instance of sfStorage');
+$t->ok($storage instanceof \sfDatabaseSessionStorage, 'sfMySQLSessionStorage is an instance of sfDatabaseSessionStorage');
 
 // regenerate()
 $storage->regenerate(false);
@@ -95,7 +95,7 @@
 try {
     $retrieved_data = $storage->sessionRead($session_id);
     $t->pass('sessionRead() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionRead() does not throw an exception');
 }
 $t->is($retrieved_data, $session_data, 'sessionRead() reads session data');
@@ -107,7 +107,7 @@
 try {
     $write = $storage->sessionWrite($session_id, $session_data);
     $t->pass('sessionWrite() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionWrite() does not throw an exception');
 }
 
@@ -118,7 +118,7 @@
 try {
     $storage->sessionDestroy($session_id);
     $t->pass('sessionDestroy() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionDestroy() does not throw an exception');
 }
 
diff --git a/test/unit/storage/sfNoStorageTest.php b/test/unit/storage/sfNoStorageTest.php
index 300373e48..7abe6d329 100644
--- a/test/unit/storage/sfNoStorageTest.php
+++ b/test/unit/storage/sfNoStorageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // initialize the storage
-$storage = new sfNoStorage();
+$storage = new \sfNoStorage();
 
-$t->ok($storage instanceof sfStorage, 'sfNoStorage is an instance of sfStorage');
+$t->ok($storage instanceof \sfStorage, 'sfNoStorage is an instance of sfStorage');
 
 // shutdown the storage
 $storage->shutdown();
diff --git a/test/unit/storage/sfPDOSessionStorageTest.php b/test/unit/storage/sfPDOSessionStorageTest.php
index d68b115cc..8194c3fa1 100644
--- a/test/unit/storage/sfPDOSessionStorageTest.php
+++ b/test/unit/storage/sfPDOSessionStorageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 ob_start();
 $plan = 14;
-$t = new lime_test($plan);
+$t = new \lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite')) {
     $t->skip('SQLite needed to run these tests', $plan);
@@ -21,16 +22,16 @@
 }
 
 // initialize the storage
-$database = new sfPDODatabase(array('dsn' => 'sqlite::memory:'));
+$database = new \sfPDODatabase(['dsn' => 'sqlite::memory:']);
 $connection = $database->getConnection();
 $connection->exec('CREATE TABLE session (sess_id, sess_data, sess_time)');
 
 ini_set('session.use_cookies', 0);
 $session_id = '1';
 
-$storage = new sfPDOSessionStorage(array('db_table' => 'session', 'session_id' => $session_id, 'database' => $database));
-$t->ok($storage instanceof sfStorage, 'sfPDOSessionStorage is an instance of sfStorage');
-$t->ok($storage instanceof sfDatabaseSessionStorage, 'sfPDOSessionStorage is an instance of sfDatabaseSessionStorage');
+$storage = new \sfPDOSessionStorage(['db_table' => 'session', 'session_id' => $session_id, 'database' => $database]);
+$t->ok($storage instanceof \sfStorage, 'sfPDOSessionStorage is an instance of sfStorage');
+$t->ok($storage instanceof \sfDatabaseSessionStorage, 'sfPDOSessionStorage is an instance of sfDatabaseSessionStorage');
 
 // regenerate()
 $oldSessionData = 'foo:bar';
@@ -58,7 +59,7 @@
 try {
     $retrieved_data = $storage->sessionRead($session_id);
     $t->pass('sessionRead() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionRead() does not throw an exception');
 }
 $t->is($retrieved_data, $newSessionData, 'sessionRead() reads session data');
@@ -69,7 +70,7 @@
 try {
     $write = $storage->sessionWrite($session_id, $otherSessionData);
     $t->pass('sessionWrite() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionWrite() does not throw an exception');
 }
 
@@ -80,7 +81,7 @@
 try {
     $storage->sessionGC(0);
     $t->pass('sessionGC() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionGC() does not throw an exception');
 }
 
@@ -88,7 +89,7 @@
 try {
     $storage->sessionDestroy($session_id);
     $t->pass('sessionDestroy() does not throw an exception');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sessionClose() does not throw an exception');
 }
 $result = $connection->query(sprintf('SELECT sess_id, sess_data FROM session WHERE sess_id = "%s"', $session_id));
diff --git a/test/unit/storage/sfSessionStorageTest.php b/test/unit/storage/sfSessionStorageTest.php
index 1a54e0091..a2a0fcaee 100644
--- a/test/unit/storage/sfSessionStorageTest.php
+++ b/test/unit/storage/sfSessionStorageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,21 +19,21 @@
 
 require_once $_test_dir.'/../lib/vendor/lime/lime.php';
 
-sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
+\sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
 // initialize the storage
 try {
-    $storage = new sfSessionStorage();
+    $storage = new \sfSessionStorage();
     $t->pass('->__construct() does not throw an exception when not provided with options');
     $storage->shutdown();
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->fail('->__construct() Startup failure');
 }
 
-$storage = new sfSessionStorage();
-$t->ok($storage instanceof sfStorage, '->__construct() is an instance of sfStorage');
+$storage = new \sfSessionStorage();
+$t->ok($storage instanceof \sfStorage, '->__construct() is an instance of sfStorage');
 
 $storage->write('test', 123);
 
diff --git a/test/unit/storage/sfStorageTest.php b/test/unit/storage/sfStorageTest.php
index 6ba8fcec1..bee712ccc 100644
--- a/test/unit/storage/sfStorageTest.php
+++ b/test/unit/storage/sfStorageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(0);
+$t = new \lime_test(0);
 
-class myStorage extends sfStorage
+class myStorage extends \sfStorage
 {
     public function read($key)
     {
diff --git a/test/unit/task/cache/sfCacheClearTaskTest.php b/test/unit/task/cache/sfCacheClearTaskTest.php
index 5f82e6545..2cf26e9d2 100644
--- a/test/unit/task/cache/sfCacheClearTaskTest.php
+++ b/test/unit/task/cache/sfCacheClearTaskTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,26 +11,26 @@
 
 require_once __DIR__.'/../../../bootstrap/task.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$dispatcher = new sfEventDispatcher();
-$formatter = new sfFormatter();
+$dispatcher = new \sfEventDispatcher();
+$formatter = new \sfFormatter();
 
-$task = new sfGenerateProjectTask($dispatcher, $formatter);
-$task->run(array('test'));
-$task = new sfGenerateAppTask($dispatcher, $formatter);
-$task->run(array('frontend'));
+$task = new \sfGenerateProjectTask($dispatcher, $formatter);
+$task->run(['test']);
+$task = new \sfGenerateAppTask($dispatcher, $formatter);
+$task->run(['frontend']);
 
-require_once sfConfig::get('sf_root_dir').'/config/ProjectConfiguration.class.php';
-$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'test', true);
+require_once \sfConfig::get('sf_root_dir').'/config/ProjectConfiguration.class.php';
+$configuration = \ProjectConfiguration::getApplicationConfiguration('frontend', 'test', true);
 
 // Put something in the cache
-$file = sfConfig::get('sf_config_cache_dir').DIRECTORY_SEPARATOR.'test';
+$file = \sfConfig::get('sf_config_cache_dir').DIRECTORY_SEPARATOR.'test';
 touch($file);
 
 $t->ok(file_exists($file), 'The test file is in the cache');
 
-$task = new sfCacheClearTask($dispatcher, $formatter);
+$task = new \sfCacheClearTask($dispatcher, $formatter);
 $task->run();
 
 $t->ok(!file_exists($file), 'The test file is removed by the cache:clear task');
diff --git a/test/unit/task/sfBaseTaskTest.php b/test/unit/task/sfBaseTaskTest.php
index 7da390a11..be3d6c16f 100644
--- a/test/unit/task/sfBaseTaskTest.php
+++ b/test/unit/task/sfBaseTaskTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,36 +11,36 @@
 
 include __DIR__.'/../../bootstrap/unit.php';
 
-require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
+require_once \sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
 
-class TestTask extends sfBaseTask
+class TestTask extends \sfBaseTask
 {
     public function reloadAutoload()
     {
         parent::reloadAutoload();
     }
 
-    public function initializeAutoload(sfProjectConfiguration $configuration, $reload = false)
+    public function initializeAutoload(\sfProjectConfiguration $configuration, $reload = false)
     {
         parent::initializeAutoload($configuration, $reload);
     }
 
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
     }
 }
 
 $rootDir = __DIR__.'/../../functional/fixtures';
-sfToolkit::clearDirectory($rootDir.'/cache');
+\sfToolkit::clearDirectory($rootDir.'/cache');
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 
 require_once $rootDir.'/config/ProjectConfiguration.class.php';
-$configuration = new ProjectConfiguration($rootDir, $dispatcher);
-$autoload = sfSimpleAutoload::getInstance();
+$configuration = new \ProjectConfiguration($rootDir, $dispatcher);
+$autoload = \sfSimpleAutoload::getInstance();
 
-$t = new lime_test(16);
-$task = new TestTask($dispatcher, new sfFormatter());
+$t = new \lime_test(16);
+$task = new \TestTask($dispatcher, new \sfFormatter());
 
 // ->initializeAutoload()
 $t->diag('->initializeAutoload()');
@@ -50,15 +51,15 @@ protected function execute($arguments = array(), $options = array())
 
 $t->ok(null !== $autoload->getClassPath('myLibClass'), '->initializeAutoload() loads project classes');
 $t->ok(null !== $autoload->getClassPath('BaseExtendMe'), '->initializeAutoload() includes plugin classes');
-$t->is($autoload->getClassPath('ExtendMe'), sfConfig::get('sf_lib_dir').'/ExtendMe.class.php', '->initializeAutoload() prefers project to plugin classes');
+$t->is($autoload->getClassPath('ExtendMe'), \sfConfig::get('sf_lib_dir').'/ExtendMe.class.php', '->initializeAutoload() prefers project to plugin classes');
 
 $task->initializeAutoload($configuration, true);
-$t->is($autoload->getClassPath('ExtendMe'), sfConfig::get('sf_lib_dir').'/ExtendMe.class.php', '->initializeAutoload() prefers project to plugin classes after reload');
+$t->is($autoload->getClassPath('ExtendMe'), \sfConfig::get('sf_lib_dir').'/ExtendMe.class.php', '->initializeAutoload() prefers project to plugin classes after reload');
 
 // ->run()
 $t->diag('->run()');
 
-class ApplicationTask extends sfBaseTask
+class ApplicationTask extends \sfBaseTask
 {
     public function getServiceContainer()
     {
@@ -77,36 +78,36 @@ public function getMailer()
 
     protected function configure()
     {
-        $this->addOption('application', null, sfCommandOption::PARAMETER_REQUIRED, '', true);
+        $this->addOption('application', null, \sfCommandOption::PARAMETER_REQUIRED, '', true);
     }
 
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
-        if (!$this->configuration instanceof sfApplicationConfiguration) {
-            throw new Exception('This task requires an application configuration be loaded.');
+        if (!$this->configuration instanceof \sfApplicationConfiguration) {
+            throw new \Exception('This task requires an application configuration be loaded.');
         }
     }
 }
 
 chdir($rootDir);
 
-$task = new ApplicationTask($dispatcher, new sfFormatter());
+$task = new \ApplicationTask($dispatcher, new \sfFormatter());
 
 try {
     $task->run();
     $t->pass('->run() creates an application configuration if none is set');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->diag($e->getMessage());
     $t->fail('->run() creates an application configuration if none is set');
 }
 
-$task = new ApplicationTask($dispatcher, new sfFormatter());
+$task = new \ApplicationTask($dispatcher, new \sfFormatter());
 $task->setConfiguration($configuration);
 
 try {
     $task->run();
     $t->pass('->run() creates an application configuration if only a project configuration is set');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->diag($e->getMessage());
     $t->fail('->run() creates an application configuration if only a project configuration is set');
 }
@@ -115,7 +116,7 @@ protected function execute($arguments = array(), $options = array())
 $t->diag('->getServiceContainer()');
 $serviceContainer = $task->getServiceContainer();
 
-$t->ok($serviceContainer instanceof sfServiceContainer, '->getServiceContainer() returns an sfServiceContainer');
+$t->ok($serviceContainer instanceof \sfServiceContainer, '->getServiceContainer() returns an sfServiceContainer');
 $t->is($serviceContainer, $task->getServiceContainer(), '->getServiceContainer() returns always the same instance');
 $t->ok($serviceContainer->hasService('my_project_service'), '->getServiceContainer() is correctly configured');
 
@@ -123,7 +124,7 @@ protected function execute($arguments = array(), $options = array())
 $t->diag('->getRouting()');
 $routing = $task->getRouting();
 
-$t->ok($routing instanceof sfRouting, '->getRouting() returns an sfPatternRouting');
+$t->ok($routing instanceof \sfRouting, '->getRouting() returns an sfPatternRouting');
 $t->is($routing, $task->getRouting(), '->getRouting() returns always the same instance');
 $t->ok($routing->hasRouteName('homepage'), '->getRouting() is correctly configured');
 
@@ -131,6 +132,6 @@ protected function execute($arguments = array(), $options = array())
 $t->diag('->getMailer()');
 $mailer = $task->getMailer();
 
-$t->ok($mailer instanceof sfMailer, '->getMailer() returns an sfMailer');
+$t->ok($mailer instanceof \sfMailer, '->getMailer() returns an sfMailer');
 $t->is($mailer, $task->getMailer(), '->getMailer() returns always the same instance');
-$t->is($mailer->getDeliveryStrategy(), sfMailer::REALTIME, '->getMailer() is correctly configured');
+$t->is($mailer->getDeliveryStrategy(), \sfMailer::REALTIME, '->getMailer() is correctly configured');
diff --git a/test/unit/task/sfFilesystemTest.php b/test/unit/task/sfFilesystemTest.php
index 0d930cc03..11ed1d6f6 100644
--- a/test/unit/task/sfFilesystemTest.php
+++ b/test/unit/task/sfFilesystemTest.php
@@ -1,18 +1,20 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 require_once __DIR__.'/../../bootstrap/unit.php';
 
 // lazy constant, cause it is so often used in this test
 define('DS', DIRECTORY_SEPARATOR);
 
-class myFilesystem extends sfFilesystem
+class myFilesystem extends \sfFilesystem
 {
     public function calculateRelativeDir($from, $to)
     {
@@ -25,10 +27,10 @@ public function canonicalizePath($path)
     }
 }
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
-$dispatcher = new sfEventDispatcher();
-$filesystem = new myFilesystem($dispatcher, null);
+$dispatcher = new \sfEventDispatcher();
+$filesystem = new \myFilesystem($dispatcher, null);
 
 $t->diag('sfFilesystem canonicalizes pathes');
 $t->is($filesystem->canonicalizePath('..'.DS.DS.'.'.DS.'..'.DS.'dir4'.DS.DS.'.'.DS.'dir5'.DS.'dir6'.DS.'..'.DS.DS.'dir7'.DS), '..'.DS.'..'.DS.'dir4'.DS.'dir5'.DS.'dir7'.DS, '->canonicalizePath() correctly resolves "\\.." and "\\."');
diff --git a/test/unit/task/sfTaskTest.php b/test/unit/task/sfTaskTest.php
index f6da65a22..1e357050e 100644
--- a/test/unit/task/sfTaskTest.php
+++ b/test/unit/task/sfTaskTest.php
@@ -1,28 +1,30 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(16);
+$t = new \lime_test(16);
 
-abstract class BaseTestTask extends sfTask
+abstract class BaseTestTask extends \sfTask
 {
-    public $lastArguments = array();
-    public $lastOptions = array();
+    public $lastArguments = [];
+    public $lastOptions = [];
 
     public function __construct()
     {
         // lazy constructor
-        parent::__construct(new sfEventDispatcher(), new sfFormatter());
+        parent::__construct(new \sfEventDispatcher(), new \sfFormatter());
     }
 
-    protected function execute($arguments = array(), $options = array())
+    protected function execute($arguments = [], $options = [])
     {
         $this->lastArguments = $arguments;
         $this->lastOptions = $options;
@@ -32,92 +34,92 @@ protected function execute($arguments = array(), $options = array())
 // ->run()
 $t->diag('->run()');
 
-class ArgumentsTest1Task extends BaseTestTask
+class ArgumentsTest1Task extends \BaseTestTask
 {
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('foo', sfCommandArgument::REQUIRED),
-            new sfCommandArgument('bar', sfCommandArgument::OPTIONAL),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('foo', \sfCommandArgument::REQUIRED),
+            new \sfCommandArgument('bar', \sfCommandArgument::OPTIONAL),
+        ]);
     }
 }
 
-$task = new ArgumentsTest1Task();
-$task->run(array('FOO'));
-$t->is_deeply($task->lastArguments, array('foo' => 'FOO', 'bar' => null), '->run() accepts an indexed array of arguments');
+$task = new \ArgumentsTest1Task();
+$task->run(['FOO']);
+$t->is_deeply($task->lastArguments, ['foo' => 'FOO', 'bar' => null], '->run() accepts an indexed array of arguments');
 
-$task->run(array('foo' => 'FOO'));
-$t->is_deeply($task->lastArguments, array('foo' => 'FOO', 'bar' => null), '->run() accepts an associative array of arguments');
+$task->run(['foo' => 'FOO']);
+$t->is_deeply($task->lastArguments, ['foo' => 'FOO', 'bar' => null], '->run() accepts an associative array of arguments');
 
-$task->run(array('bar' => 'BAR', 'foo' => 'FOO'));
-$t->is_deeply($task->lastArguments, array('foo' => 'FOO', 'bar' => 'BAR'), '->run() accepts an unordered associative array of arguments');
+$task->run(['bar' => 'BAR', 'foo' => 'FOO']);
+$t->is_deeply($task->lastArguments, ['foo' => 'FOO', 'bar' => 'BAR'], '->run() accepts an unordered associative array of arguments');
 
 $task->run('FOO BAR');
-$t->is_deeply($task->lastArguments, array('foo' => 'FOO', 'bar' => 'BAR'), '->run() accepts a string of arguments');
+$t->is_deeply($task->lastArguments, ['foo' => 'FOO', 'bar' => 'BAR'], '->run() accepts a string of arguments');
 
-$task->run(array('foo' => 'FOO', 'bar' => null));
-$t->is_deeply($task->lastArguments, array('foo' => 'FOO', 'bar' => null), '->run() accepts an associative array of arguments when optional arguments are passed as null');
+$task->run(['foo' => 'FOO', 'bar' => null]);
+$t->is_deeply($task->lastArguments, ['foo' => 'FOO', 'bar' => null], '->run() accepts an associative array of arguments when optional arguments are passed as null');
 
-$task->run(array('bar' => null, 'foo' => 'FOO'));
-$t->is_deeply($task->lastArguments, array('foo' => 'FOO', 'bar' => null), '->run() accepts an unordered associative array of arguments when optional arguments are passed as null');
+$task->run(['bar' => null, 'foo' => 'FOO']);
+$t->is_deeply($task->lastArguments, ['foo' => 'FOO', 'bar' => null], '->run() accepts an unordered associative array of arguments when optional arguments are passed as null');
 
-class ArgumentsTest2Task extends BaseTestTask
+class ArgumentsTest2Task extends \BaseTestTask
 {
     protected function configure()
     {
-        $this->addArguments(array(
-            new sfCommandArgument('foo', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY),
-        ));
+        $this->addArguments([
+            new \sfCommandArgument('foo', \sfCommandArgument::OPTIONAL | \sfCommandArgument::IS_ARRAY),
+        ]);
     }
 }
 
-$task = new ArgumentsTest2Task();
-$task->run(array('arg1', 'arg2', 'arg3'));
-$t->is_deeply($task->lastArguments, array('foo' => array('arg1', 'arg2', 'arg3')), '->run() accepts an indexed array of an IS_ARRAY argument');
+$task = new \ArgumentsTest2Task();
+$task->run(['arg1', 'arg2', 'arg3']);
+$t->is_deeply($task->lastArguments, ['foo' => ['arg1', 'arg2', 'arg3']], '->run() accepts an indexed array of an IS_ARRAY argument');
 
-$task->run(array('foo' => array('arg1', 'arg2', 'arg3')));
-$t->is_deeply($task->lastArguments, array('foo' => array('arg1', 'arg2', 'arg3')), '->run() accepts an associative array of an IS_ARRAY argument');
+$task->run(['foo' => ['arg1', 'arg2', 'arg3']]);
+$t->is_deeply($task->lastArguments, ['foo' => ['arg1', 'arg2', 'arg3']], '->run() accepts an associative array of an IS_ARRAY argument');
 
-class OptionsTest1Task extends BaseTestTask
+class OptionsTest1Task extends \BaseTestTask
 {
     protected function configure()
     {
-        $this->addOptions(array(
-            new sfCommandOption('none', null, sfCommandOption::PARAMETER_NONE),
-            new sfCommandOption('required', null, sfCommandOption::PARAMETER_REQUIRED),
-            new sfCommandOption('optional', null, sfCommandOption::PARAMETER_OPTIONAL),
-            new sfCommandOption('array', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY),
-        ));
+        $this->addOptions([
+            new \sfCommandOption('none', null, \sfCommandOption::PARAMETER_NONE),
+            new \sfCommandOption('required', null, \sfCommandOption::PARAMETER_REQUIRED),
+            new \sfCommandOption('optional', null, \sfCommandOption::PARAMETER_OPTIONAL),
+            new \sfCommandOption('array', null, \sfCommandOption::PARAMETER_REQUIRED | \sfCommandOption::IS_ARRAY),
+        ]);
     }
 }
 
-$task = new OptionsTest1Task();
+$task = new \OptionsTest1Task();
 $task->run();
-$t->is_deeply($task->lastOptions, array('none' => false, 'required' => null, 'optional' => null, 'array' => array()), '->run() sets empty option values');
+$t->is_deeply($task->lastOptions, ['none' => false, 'required' => null, 'optional' => null, 'array' => []], '->run() sets empty option values');
 
-$task->run(array(), array('--none', '--required=TEST1', '--array=one', '--array=two', '--array=three'));
-$t->is_deeply($task->lastOptions, array('none' => true, 'required' => 'TEST1', 'optional' => null, 'array' => array('one', 'two', 'three')), '->run() accepts an indexed array of option values');
+$task->run([], ['--none', '--required=TEST1', '--array=one', '--array=two', '--array=three']);
+$t->is_deeply($task->lastOptions, ['none' => true, 'required' => 'TEST1', 'optional' => null, 'array' => ['one', 'two', 'three']], '->run() accepts an indexed array of option values');
 
-$task->run(array(), array('none', 'required=TEST1', 'array=one', 'array=two', 'array=three'));
-$t->is_deeply($task->lastOptions, array('none' => true, 'required' => 'TEST1', 'optional' => null, 'array' => array('one', 'two', 'three')), '->run() accepts an indexed array of unflagged option values');
+$task->run([], ['none', 'required=TEST1', 'array=one', 'array=two', 'array=three']);
+$t->is_deeply($task->lastOptions, ['none' => true, 'required' => 'TEST1', 'optional' => null, 'array' => ['one', 'two', 'three']], '->run() accepts an indexed array of unflagged option values');
 
-$task->run(array(), array('none' => false, 'required' => 'TEST1', 'array' => array('one', 'two', 'three')));
-$t->is_deeply($task->lastOptions, array('none' => false, 'required' => 'TEST1', 'optional' => null, 'array' => array('one', 'two', 'three')), '->run() accepts an associative array of option values');
+$task->run([], ['none' => false, 'required' => 'TEST1', 'array' => ['one', 'two', 'three']]);
+$t->is_deeply($task->lastOptions, ['none' => false, 'required' => 'TEST1', 'optional' => null, 'array' => ['one', 'two', 'three']], '->run() accepts an associative array of option values');
 
-$task->run(array(), array('optional' => null, 'array' => array()));
-$t->is_deeply($task->lastOptions, array('none' => false, 'required' => null, 'optional' => null, 'array' => array()), '->run() accepts an associative array of options when optional values are passed as empty');
+$task->run([], ['optional' => null, 'array' => []]);
+$t->is_deeply($task->lastOptions, ['none' => false, 'required' => null, 'optional' => null, 'array' => []], '->run() accepts an associative array of options when optional values are passed as empty');
 
 $task->run('--none --required=TEST1 --array=one --array=two --array=three');
-$t->is_deeply($task->lastOptions, array('none' => true, 'required' => 'TEST1', 'optional' => null, 'array' => array('one', 'two', 'three')), '->run() accepts a string of options');
+$t->is_deeply($task->lastOptions, ['none' => true, 'required' => 'TEST1', 'optional' => null, 'array' => ['one', 'two', 'three']], '->run() accepts a string of options');
 
-$task->run(array(), array('array' => 'one'));
-$t->is_deeply($task->lastOptions, array('none' => false, 'required' => null, 'optional' => null, 'array' => array('one')), '->run() accepts an associative array of options with a scalar array option value');
+$task->run([], ['array' => 'one']);
+$t->is_deeply($task->lastOptions, ['none' => false, 'required' => null, 'optional' => null, 'array' => ['one']], '->run() accepts an associative array of options with a scalar array option value');
 
 // ->getDetailedDescription()
 $t->diag('->getDetailedDescription()');
 
-class DetailedDescriptionTestTask extends BaseTestTask
+class DetailedDescriptionTestTask extends \BaseTestTask
 {
     protected function configure()
     {
@@ -127,5 +129,5 @@ protected function configure()
     }
 }
 
-$task = new DetailedDescriptionTestTask();
+$task = new \DetailedDescriptionTestTask();
 $t->is($task->getDetailedDescription(), 'The detailedDescription formats special string like ... or --xml', '->getDetailedDescription() formats special string');
diff --git a/test/unit/test/limeTestTest.php b/test/unit/test/limeTestTest.php
index c3e641016..b93e31bee 100644
--- a/test/unit/test/limeTestTest.php
+++ b/test/unit/test/limeTestTest.php
@@ -1,8 +1,17 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(28);
+$t = new \lime_test(28);
 
 $t->comment('A. Equal numbers');
 $t->is(1, 1);
@@ -28,14 +37,14 @@
 $t->isnt(100, 100.1);
 $t->isnt(0, -1);
 $t->isnt(-2, 'Hello');
-$t->isnt(100, array(100));
+$t->isnt(100, [100]);
 
 $t->comment('E. Both falsy');
 $t->is(0, false);
 $t->is(0, null);
 $t->is('', false);
 $t->is(false, null);
-$t->is(array(), null);
+$t->is([], null);
 
 $t->comment('F. Values that should not be equal');
 $t->isnt(true, 'Hello');
diff --git a/test/unit/test/sfTestFunctionalTest.php b/test/unit/test/sfTestFunctionalTest.php
index 509f97182..cb87ecf7c 100644
--- a/test/unit/test/sfTestFunctionalTest.php
+++ b/test/unit/test/sfTestFunctionalTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,31 +11,31 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-class mockBrowser extends sfBrowser
+class mockBrowser extends \sfBrowser
 {
     public function setResponseContent($content)
     {
-        $this->dom = new DOMDocument('1.0');
+        $this->dom = new \DOMDocument('1.0');
         $this->dom->validateOnParse = true;
         @$this->dom->loadHTML($content);
-        $this->domCssSelector = new sfDomCssSelector($this->dom);
+        $this->domCssSelector = new \sfDomCssSelector($this->dom);
     }
 }
 
-class mockLime extends lime_test
+class mockLime extends \lime_test
 {
     public function __destruct()
     {
     }
 }
 
-class mockTestFunctional extends sfTestFunctional
+class mockTestFunctional extends \sfTestFunctional
 {
-    public $called = array();
+    public $called = [];
 
-    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    public function call($uri, $method = 'get', $parameters = [], $changeStack = true)
     {
         $this->called[] = func_get_args();
     }
@@ -50,18 +51,18 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
 </html>
 HTML;
 
-$browser = new mockBrowser();
+$browser = new \mockBrowser();
 $browser->setResponseContent($html);
 
-$lime = new mockLime();
-$tester = new mockTestFunctional($browser, $lime);
+$lime = new \mockLime();
+$tester = new \mockTestFunctional($browser, $lime);
 
 try {
     $tester->click('a.clickme');
     $t->pass('->click() accepts a CSS selector');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->diag($e->getMessage());
     $t->fail('->click() accepts a CSS selector');
 }
 
-$t->is_deeply($tester->called, array(array('/somewhere', 'get', array())), '->click() parses a CSS selector');
+$t->is_deeply($tester->called, [['/somewhere', 'get', []]], '->click() parses a CSS selector');
diff --git a/test/unit/user/sfBasicSecurityUserTest.php b/test/unit/user/sfBasicSecurityUserTest.php
index d7e74ccb9..8d534e53a 100644
--- a/test/unit/user/sfBasicSecurityUserTest.php
+++ b/test/unit/user/sfBasicSecurityUserTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(47);
+$t = new \lime_test(47);
 
-class MySessionStorage extends sfSessionTestStorage
+class MySessionStorage extends \sfSessionTestStorage
 {
     public function regenerate($destroy = false)
     {
@@ -22,11 +23,11 @@ public function regenerate($destroy = false)
     }
 }
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 $sessionPath = sys_get_temp_dir().'/sessions_'.rand(11111, 99999);
-$storage = new MySessionStorage(array('session_path' => $sessionPath));
+$storage = new \MySessionStorage(['session_path' => $sessionPath]);
 
-$user = new sfBasicSecurityUser($dispatcher, $storage);
+$user = new \sfBasicSecurityUser($dispatcher, $storage);
 
 // ->initialize()
 $t->diag('->initialize()');
@@ -36,7 +37,7 @@ public function regenerate($destroy = false)
 $t->diag('->getCredentials()');
 $user->clearCredentials();
 $user->addCredential('user');
-$t->is($user->getCredentials(), array('user'), '->getCredentials() returns user credentials as an array');
+$t->is($user->getCredentials(), ['user'], '->getCredentials() returns user credentials as an array');
 
 // ->setAuthenticated() ->isAuthenticated()
 $t->diag('->setAuthenticated() ->isAuthenticated()');
@@ -61,7 +62,7 @@ public function regenerate($destroy = false)
 $t->is($id, $storage->getSessionId(), '->removeCredential() does not regenerate the session id if the credential does not exist');
 
 // ->setTimedOut() ->getTimedOut()
-$user = new sfBasicSecurityUser($dispatcher, $storage);
+$user = new \sfBasicSecurityUser($dispatcher, $storage);
 $t->diag('->setTimedOut() ->isTimedOut()');
 $t->is($user->isTimedOut(), false, '->isTimedOut() returns false if the session is not timed out');
 $user->setTimedOut();
@@ -76,20 +77,20 @@ public function regenerate($destroy = false)
 $t->is($user->hasCredential('admin'), true, '->addCredential() takes a credential as its first argument');
 
 // admin AND user
-$t->is($user->hasCredential(array('admin', 'user')), false, '->hasCredential() can takes an array of credential as a parameter');
+$t->is($user->hasCredential(['admin', 'user']), false, '->hasCredential() can takes an array of credential as a parameter');
 
 // admin OR user
-$t->is($user->hasCredential(array(array('admin', 'user'))), true, '->hasCredential() can takes an array of credential as a parameter');
+$t->is($user->hasCredential([['admin', 'user']]), true, '->hasCredential() can takes an array of credential as a parameter');
 
 // (admin OR user) AND owner
-$t->is($user->hasCredential(array(array('admin', 'user'), 'owner')), false, '->hasCredential() can takes an array of credential as a parameter');
+$t->is($user->hasCredential([['admin', 'user'], 'owner']), false, '->hasCredential() can takes an array of credential as a parameter');
 $user->addCredential('owner');
-$t->is($user->hasCredential(array(array('admin', 'user'), 'owner')), true, '->hasCredential() can takes an array of credential as a parameter');
+$t->is($user->hasCredential([['admin', 'user'], 'owner']), true, '->hasCredential() can takes an array of credential as a parameter');
 
 // [[root, admin, editor, [supplier, owner], [supplier, group], accounts]]
 // root OR admin OR editor OR (supplier AND owner) OR (supplier AND group) OR accounts
 $user->clearCredentials();
-$credential = array(array('root', 'admin', 'editor', array('supplier', 'owner'), array('supplier', 'group'), 'accounts'));
+$credential = [['root', 'admin', 'editor', ['supplier', 'owner'], ['supplier', 'group'], 'accounts']];
 $t->is($user->hasCredential($credential), false, '->hasCredential() can takes an array of credential as a parameter');
 $user->addCredential('admin');
 $t->is($user->hasCredential($credential), true, '->hasCredential() can takes an array of credential as a parameter');
@@ -102,7 +103,7 @@ public function regenerate($destroy = false)
 // [[root, [supplier, [owner, quasiowner]], accounts]]
 // root OR (supplier AND (owner OR quasiowner)) OR accounts
 $user->clearCredentials();
-$credential = array(array('root', array('supplier', array('owner', 'quasiowner')), 'accounts'));
+$credential = [['root', ['supplier', ['owner', 'quasiowner']], 'accounts']];
 $t->is($user->hasCredential($credential), false, '->hasCredential() can takes an array of credential as a parameter');
 $user->addCredential('root');
 $t->is($user->hasCredential($credential), true, '->hasCredential() can takes an array of credential as a parameter');
@@ -129,22 +130,22 @@ public function regenerate($destroy = false)
 $t->is($user->hasCredential('superadmin'), true);
 
 // admin and (user or subscriber)
-$t->is($user->hasCredential(array(array('admin', array('user', 'subscriber')))), true);
+$t->is($user->hasCredential([['admin', ['user', 'subscriber']]]), true);
 
-$user->addCredentials(array('superadmin1', 'subscriber1'));
+$user->addCredentials(['superadmin1', 'subscriber1']);
 $t->is($user->hasCredential('subscriber1'), true);
 $t->is($user->hasCredential('superadmin1'), true);
 
 // admin and (user or subscriber) and (superadmin1 or subscriber1)
-$t->is($user->hasCredential(array(array('admin', array('user', 'subscriber'), array('superadmin1', 'subscriber1')))), true);
+$t->is($user->hasCredential([['admin', ['user', 'subscriber'], ['superadmin1', 'subscriber1']]]), true);
 
 // numerical credentials
 $user->clearCredentials();
-$user->addCredentials(array('1', 2));
+$user->addCredentials(['1', 2]);
 $t->is($user->hasCredential(1), true, '->hasCrendential() supports numerical credentials');
 $t->is($user->hasCredential('2'), true, '->hasCrendential() supports numerical credentials');
-$t->is($user->hasCredential(array('1', 2)), true, '->hasCrendential() supports numerical credentials');
-$t->is($user->hasCredential(array(1, '2')), true, '->hasCrendential() supports numerical credentials');
+$t->is($user->hasCredential(['1', 2]), true, '->hasCrendential() supports numerical credentials');
+$t->is($user->hasCredential([1, '2']), true, '->hasCrendential() supports numerical credentials');
 
 // ->removeCredential()
 $t->diag('->removeCredential()');
@@ -160,10 +161,10 @@ public function regenerate($destroy = false)
 // timeout
 $user->setAuthenticated(true);
 $user->shutdown();
-$user = new sfBasicSecurityUser($dispatcher, $storage, array('timeout' => 0));
+$user = new \sfBasicSecurityUser($dispatcher, $storage, ['timeout' => 0]);
 $t->is($user->isTimedOut(), true, '->initialize() times out the user if no request made for a long time');
 
-$user = new sfBasicSecurityUser($dispatcher, $storage, array('timeout' => false));
+$user = new \sfBasicSecurityUser($dispatcher, $storage, ['timeout' => false]);
 $t->is($user->isTimedOut(), false, '->initialize() takes a timeout parameter which can be false to disable session timeout');
 
-sfToolkit::clearDirectory($sessionPath);
+\sfToolkit::clearDirectory($sessionPath);
diff --git a/test/unit/user/sfUserTest.php b/test/unit/user/sfUserTest.php
index 2fe116d25..23ecce7bc 100644
--- a/test/unit/user/sfUserTest.php
+++ b/test/unit/user/sfUserTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,22 +11,22 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(32);
+$t = new \lime_test(32);
 
 $_SERVER['session_id'] = 'test';
 
-$dispatcher = new sfEventDispatcher();
+$dispatcher = new \sfEventDispatcher();
 $sessionPath = sys_get_temp_dir().'/sessions_'.rand(11111, 99999);
-$storage = new sfSessionTestStorage(array('session_path' => $sessionPath));
+$storage = new \sfSessionTestStorage(['session_path' => $sessionPath]);
 
-$user = new sfUser($dispatcher, $storage);
+$user = new \sfUser($dispatcher, $storage);
 
 // ->initialize()
 $t->diag('->initialize()');
 $t->is($user->getCulture(), 'en', '->initialize() sets the culture to "en" by default');
 
 $user->setCulture(null);
-$user->initialize($dispatcher, $storage, array('default_culture' => 'de'));
+$user->initialize($dispatcher, $storage, ['default_culture' => 'de']);
 
 user_flush($dispatcher, $user, $storage);
 
@@ -34,7 +35,7 @@
 user_flush($dispatcher, $user, $storage);
 $t->is($user->getCulture(), 'de', '->initialize() reads the culture from the session data if available');
 
-$userBis = new sfUser($dispatcher, $storage);
+$userBis = new \sfUser($dispatcher, $storage);
 $t->is($userBis->getCulture(), 'de', '->initialize() serializes the culture to the session data');
 
 // ->setCulture() ->getCulture()
@@ -44,18 +45,18 @@
 
 // ->setFlash() ->getFlash() ->hasFlash()
 $t->diag('->setFlash() ->getFlash() ->hasFlash()');
-$user->initialize($dispatcher, $storage, array('use_flash' => true));
+$user->initialize($dispatcher, $storage, ['use_flash' => true]);
 $user->setFlash('foo', 'bar');
 $t->is($user->getFlash('foo'), 'bar', '->setFlash() sets a flash variable');
 $t->is($user->hasFlash('foo'), true, '->hasFlash() returns true if the flash variable exists');
-user_flush($dispatcher, $user, $storage, array('use_flash' => true));
+user_flush($dispatcher, $user, $storage, ['use_flash' => true]);
 
-$userBis = new sfUser($dispatcher, $storage, array('use_flash' => true));
+$userBis = new \sfUser($dispatcher, $storage, ['use_flash' => true]);
 $t->is($userBis->getFlash('foo'), 'bar', '->getFlash() returns a flash previously set');
 $t->is($userBis->hasFlash('foo'), true, '->hasFlash() returns true if the flash variable exists');
-user_flush($dispatcher, $user, $storage, array('use_flash' => true));
+user_flush($dispatcher, $user, $storage, ['use_flash' => true]);
 
-$userBis = new sfUser($dispatcher, $storage, array('use_flash' => true));
+$userBis = new \sfUser($dispatcher, $storage, ['use_flash' => true]);
 $t->is($userBis->getFlash('foo'), null, 'Flashes are automatically removed after the next request');
 $t->is($userBis->hasFlash('foo'), false, '->hasFlash() returns true if the flash variable exists');
 
@@ -74,21 +75,21 @@
 unset($user['foo2']);
 $t->is(isset($user['foo2']), false, '->offsetUnset() unsets attribute by name');
 
-$user = new sfUser($dispatcher, $storage);
+$user = new \sfUser($dispatcher, $storage);
 
 // attribute holder proxy
 require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
-$pht = new sfParameterHolderProxyTest($t);
+$pht = new \sfParameterHolderProxyTest($t);
 $pht->launchTests($user, 'attribute');
 
 // new methods via sfEventDispatcher
 require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
-$dispatcherTest = new sfEventDispatcherTest($t);
+$dispatcherTest = new \sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($dispatcher, $user, 'user');
 
 $storage->clear();
 
-function user_flush($dispatcher, $user, $storage, $options = array())
+function user_flush($dispatcher, $user, $storage, $options = [])
 {
     $user->shutdown();
     $user->initialize($dispatcher, $storage, $options);
@@ -97,4 +98,4 @@ function user_flush($dispatcher, $user, $storage, $options = array())
     $storage->initialize($parameters);
 }
 
-sfToolkit::clearDirectory($sessionPath);
+\sfToolkit::clearDirectory($sessionPath);
diff --git a/test/unit/util/sfBrowserTest.php b/test/unit/util/sfBrowserTest.php
index 137c2d43e..7b69e82c3 100755
--- a/test/unit/util/sfBrowserTest.php
+++ b/test/unit/util/sfBrowserTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,36 +11,36 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(76);
+$t = new \lime_test(76);
 
 // ->click()
 $t->diag('->click()');
 
-class myClickBrowser extends sfBrowser
+class myClickBrowser extends \sfBrowser
 {
     public function setHtml($html)
     {
-        $this->dom = new DOMDocument('1.0', 'UTF-8');
+        $this->dom = new \DOMDocument('1.0', 'UTF-8');
         $this->dom->validateOnParse = true;
         $this->dom->loadHTML($html);
-        $this->domCssSelector = new sfDomCssSelector($this->dom);
+        $this->domCssSelector = new \sfDomCssSelector($this->dom);
     }
 
     public function getFiles()
     {
         $f = $this->files;
-        $this->files = array();
+        $this->files = [];
 
         return $f;
     }
 
-    public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
+    public function call($uri, $method = 'get', $parameters = [], $changeStack = true)
     {
         $uri = $this->fixUri($uri);
 
-        $this->fields = array();
+        $this->fields = [];
 
-        return array($method, $uri, $parameters);
+        return [$method, $uri, $parameters];
     }
 
     public function getDefaultServerArray($name)
@@ -147,36 +148,36 @@ public function getDefaultServerArray($name)
 </html>
 EOF;
 
-$b = new myClickBrowser();
+$b = new \myClickBrowser();
 $b->setHtml($html);
 
 try {
     $b->click('nonexistantname');
     $t->fail('->click() throws an error if the name does not exist');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->click() throws an error if the name does not exist');
 }
 
 try {
     list($method, $uri, $parameters) = $b->click('submit5');
     $t->pass('->click() clicks on button links');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('->click() clicks on button links');
 }
 
 list($method, $uri, $parameters) = $b->click('test link');
 $t->is($uri, '/mylink', '->click() clicks on links');
 
-list($method, $uri, $parameters) = $b->click('test link', array(), array('position' => 2));
+list($method, $uri, $parameters) = $b->click('test link', [], ['position' => 2]);
 $t->is($uri, '/myotherlink', '->click() can take a third argument to tell the position of the link to click on');
 
 list($method, $uri, $parameters) = $b->click('image link');
 $t->is($uri, '/myimagelink', '->click() clicks on image links');
 
-list($method, $uri, $parameters) = $b->click('submit', null, array('position' => 2));
+list($method, $uri, $parameters) = $b->click('submit', null, ['position' => 2]);
 $t->is($uri, '/submitlink', '->click() clicks on submit link at position 2');
 
-list($method, $uri, $parameters) = $b->click('submit', null, array('position' => 3));
+list($method, $uri, $parameters) = $b->click('submit', null, ['position' => 3]);
 $t->is($uri, '/submitimagelink', '->click() clicks on submit image link at position 3');
 
 list($method, $uri, $parameters) = $b->click('submit');
@@ -186,13 +187,13 @@ public function getDefaultServerArray($name)
 $t->is($parameters['text'], '', '->click() uses default form field values (input)');
 $t->is($parameters['textarea'], 'content', '->click() uses default form field values (textarea)');
 $t->is($parameters['select'], 'selected', '->click() uses default form field values (select)');
-$t->is($parameters['select_multiple'], array('selected', 'last'), '->click() uses default form field values (select - multiple)');
+$t->is($parameters['select_multiple'], ['selected', 'last'], '->click() uses default form field values (select - multiple)');
 $t->is($parameters['article']['title'], 'title', '->click() recognizes array names');
-$t->is($parameters['article']['category'], array('2', '3'), '->click() recognizes array names');
+$t->is($parameters['article']['category'], ['2', '3'], '->click() recognizes array names');
 $t->is($parameters['article']['or']['much']['longer'], 'very long!', '->click() recognizes array names');
 $t->is($parameters['submit'], 'submit', '->click() populates button clicked');
 $t->ok(!isset($parameters['mybutton']), '->click() do not populate buttons not clicked');
-$t->is($parameters['myarray'], array('value1', 'value2', 'value3'), '->click() recognizes array names');
+$t->is($parameters['myarray'], ['value1', 'value2', 'value3'], '->click() recognizes array names');
 $t->is($parameters['checkbox1'], 'checkboxvalue', '->click() returns the value of the checkbox value attribute');
 $t->is($parameters['checkbox2'], '1', '->click() returns 1 if the checkbox has no value');
 
@@ -218,37 +219,37 @@ public function getDefaultServerArray($name)
 list($method, $uri, $parameters) = $b->click('image submit');
 $t->is($uri, '/myform4?submit_image=image', '->click() can click on image button in forms');
 
-list($method, $uri, $parameters) = $b->click('submit', array(
+list($method, $uri, $parameters) = $b->click('submit', [
     'text_default_value' => 'myvalue',
     'text' => 'myothervalue',
     'textarea' => 'mycontent',
     'select' => 'last',
-    'select_multiple' => array('first', 'selected', 'last'),
-    'article' => array(
+    'select_multiple' => ['first', 'selected', 'last'],
+    'article' => [
         'title' => 'mytitle',
-        'category' => array(1, 2, 3),
-        'or' => array('much' => array('longer' => 'long')),
-    ),
-));
+        'category' => [1, 2, 3],
+        'or' => ['much' => ['longer' => 'long']],
+    ],
+]);
 $t->is($parameters['text_default_value'], 'myvalue', '->click() takes an array of parameters as its second argument');
 $t->is($parameters['text'], 'myothervalue', '->click() can override input fields');
 $t->is($parameters['textarea'], 'mycontent', '->click() can override textarea fields');
 $t->is($parameters['select'], 'last', '->click() can override select fields');
-$t->is($parameters['select_multiple'], array('first', 'selected', 'last'), '->click() can override select (multiple) fields');
+$t->is($parameters['select_multiple'], ['first', 'selected', 'last'], '->click() can override select (multiple) fields');
 $t->is($parameters['article']['title'], 'mytitle', '->click() can override array fields');
-$t->is($parameters['article']['category'], array(1, 2, 3), '->click() can override array fields');
+$t->is($parameters['article']['category'], [1, 2, 3], '->click() can override array fields');
 $t->is($parameters['article']['or']['much']['longer'], 'long', '->click() recognizes array names');
 $t->is(isset($parameters['i_am_disabled']), false, '->click() ignores disabled fields');
 
 list($method, $uri, $parameters) = $b->click('#clickable-link');
 $t->is($method, 'get', '->click() accepts a CSS selector');
 $t->is($uri, '/mylink', '->click() accepts a CSS selector');
-$t->is_deeply($parameters, array(), '->click() accepts a CSS selector');
+$t->is_deeply($parameters, [], '->click() accepts a CSS selector');
 
-list($method, $uri, $parameters) = $b->click('.one-of-many-clickable-links', array(), array('position' => 2));
+list($method, $uri, $parameters) = $b->click('.one-of-many-clickable-links', [], ['position' => 2]);
 $t->is($method, 'get', '->click() accepts a CSS selector and position option');
 $t->is($uri, '/myimagelink', '->click() accepts a CSS selector and position option');
-$t->is_deeply($parameters, array(), '->click() accepts a CSS selector and position option');
+$t->is_deeply($parameters, [], '->click() accepts a CSS selector and position option');
 
 list($method, $uri, $parameters) = $b->click('#clickable-input-submit');
 $t->is($method, 'post', '->click() accepts a CSS selector for a submit input');
@@ -257,7 +258,7 @@ public function getDefaultServerArray($name)
 try {
     $b->click('#orphaned-input-submit');
     $t->fail('->click() throws an error if a submit is clicked outside a form');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->click() throws an error if a submit is clicked outside a form');
 }
 
@@ -274,12 +275,12 @@ public function getDefaultServerArray($name)
 $t->is($parameters['text_default_value'], 'myvalue', '->setField() overrides default form field values');
 $t->is($parameters['text'], 'myothervalue', '->setField() overrides default form field values');
 $t->is($parameters['article']['title'], 'mytitle', '->setField() overrides default form field values');
-$t->is($parameters['myarray'], array('value0', 'value1', 'value2'), '->setField() overrides default form field values');
+$t->is($parameters['myarray'], ['value0', 'value1', 'value2'], '->setField() overrides default form field values');
 
 list($method, $uri, $parameters) = $b->
   setField('text_default_value', 'myvalue')->
   setField('text', 'myothervalue')->
-  click('submit', array('text_default_value' => 'yourvalue', 'text' => 'yourothervalue'));
+  click('submit', ['text_default_value' => 'yourvalue', 'text' => 'yourothervalue']);
 $t->is($parameters['text_default_value'], 'yourvalue', '->setField() is overriden by parameters from click call');
 $t->is($parameters['text'], 'yourothervalue', '->setField() is overriden by parameters from click call');
 
@@ -301,7 +302,7 @@ public function getDefaultServerArray($name)
 try {
     $b->deselect('b-radio');
     $t->fail('->deselect() cannot deselect radiobuttons');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->deselect() cannot deselect radiobuttons');
 }
 
@@ -319,19 +320,19 @@ public function getDefaultServerArray($name)
 // file uploads
 $t->diag('file uploads');
 
-$unexistentFilename = sfConfig::get('sf_test_cache_dir').DIRECTORY_SEPARATOR.'unexistent-file-'.md5(getmypid().'-'.microtime());
-$existentFilename = sfConfig::get('sf_test_cache_dir').DIRECTORY_SEPARATOR.'existent-file-'.md5(getmypid().'-'.microtime());
+$unexistentFilename = \sfConfig::get('sf_test_cache_dir').DIRECTORY_SEPARATOR.'unexistent-file-'.md5(getmypid().'-'.microtime());
+$existentFilename = \sfConfig::get('sf_test_cache_dir').DIRECTORY_SEPARATOR.'existent-file-'.md5(getmypid().'-'.microtime());
 file_put_contents($existentFilename, 'test');
 
-list($method, $uri, $parameters) = $b->click('submit', array('myfile' => $unexistentFilename));
+list($method, $uri, $parameters) = $b->click('submit', ['myfile' => $unexistentFilename]);
 $files = $b->getFiles();
 $t->is($method, 'post', 'file upload is using right method');
 $t->ok(!isset($parameters['myfile']), 'file upload key is removed from the main request');
 $t->is(isset($files['myfile']) && is_array($files['myfile']), true, 'file upload set up a _FILE entry for our test file');
-$t->is(array_keys($files['myfile']), array('name', 'type', 'tmp_name', 'error', 'size'), 'file upload returns correctly formatted array');
+$t->is(array_keys($files['myfile']), ['name', 'type', 'tmp_name', 'error', 'size'], 'file upload returns correctly formatted array');
 $t->is($files['myfile']['error'], UPLOAD_ERR_NO_FILE, 'unexistent file does not exists (UPLOAD_ERR_NO_FILE)');
 
-list($method, $uri, $parameters) = $b->click('submit', array('myfile' => $existentFilename));
+list($method, $uri, $parameters) = $b->click('submit', ['myfile' => $existentFilename]);
 $files = $b->getFiles();
 
 $t->is($files['myfile']['error'], UPLOAD_ERR_OK, 'existent file exists (UPLOAD_ERR_OK)');
diff --git a/test/unit/util/sfCallableTest.php b/test/unit/util/sfCallableTest.php
index 36594c8b1..65f893cd9 100644
--- a/test/unit/util/sfCallableTest.php
+++ b/test/unit/util/sfCallableTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(5);
+$t = new \lime_test(5);
 
 // call()
 $t->diag('call()');
-$c = new sfCallable('trim');
+$c = new \sfCallable('trim');
 $t->is($c->call('  foo  '), 'foo', '->call() calls the callable with the given arguments');
 
 class TrimTest
@@ -30,22 +31,22 @@ public function trim($text)
     }
 }
 
-$c = new sfCallable(array('TrimTest', 'trimStatic'));
+$c = new \sfCallable(['TrimTest', 'trimStatic']);
 $t->is($c->call('  foo  '), 'foo', '->call() calls the callable with the given arguments');
 
-$c = new sfCallable(array(new TrimTest(), 'trim'));
+$c = new \sfCallable([new \TrimTest(), 'trim']);
 $t->is($c->call('  foo  '), 'foo', '->call() calls the callable with the given arguments');
 
-$c = new sfCallable('nonexistantcallable');
+$c = new \sfCallable('nonexistantcallable');
 
 try {
     $c->call();
     $t->fail('->call() throws an sfException if the callable is not valid');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->call() throws an sfException if the callable is not valid');
 }
 
 // ->getCallable()
 $t->diag('->getCallable()');
-$c = new sfCallable('trim');
+$c = new \sfCallable('trim');
 $t->is($c->getCallable(), 'trim', '->getCallable() returns the current callable');
diff --git a/test/unit/util/sfClassManipulatorTest.php b/test/unit/util/sfClassManipulatorTest.php
index 8111118ec..dd26d8b26 100644
--- a/test/unit/util/sfClassManipulatorTest.php
+++ b/test/unit/util/sfClassManipulatorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(18);
+$t = new \lime_test(18);
 
 $source = <<<'EOF'
 <?php
@@ -110,24 +111,24 @@ function baz()
 
 // ->wrapMethod()
 $t->diag('->wrapMethod()');
-$m = new sfClassManipulator($source);
+$m = new \sfClassManipulator($source);
 $t->is(fix_linebreaks($m->wrapMethod('bar', '// code before', '// code after')), fix_linebreaks($source), '->wrapMethod() does nothing if the method does not exist.');
-$m = new sfClassManipulator($source);
+$m = new \sfClassManipulator($source);
 $t->is(fix_linebreaks($m->wrapMethod('foo', '// code before')), fix_linebreaks($sourceWithCodeBefore), '->wrapMethod() adds code before the beginning of a method.');
-$m = new sfClassManipulator($source);
+$m = new \sfClassManipulator($source);
 $t->is(fix_linebreaks($m->wrapMethod('foo', '', '// code after')), fix_linebreaks($sourceWithCodeAfter), '->wrapMethod() adds code after the end of a method.');
 $t->is(fix_linebreaks($m->wrapMethod('foo', '// code before')), fix_linebreaks($sourceWithCodeBeforeAndAfter), '->wrapMethod() adds code to the previously manipulated code.');
 
 // ->getCode()
 $t->diag('->getCode()');
-$m = new sfClassManipulator($source);
+$m = new \sfClassManipulator($source);
 $t->is(fix_linebreaks($m->getCode()), fix_linebreaks($source), '->getCode() returns the source code when no manipulations has been done');
 $m->wrapMethod('foo', '', '// code after');
 $t->is(fix_linebreaks($m->getCode()), fix_linebreaks($sourceWithCodeAfter), '->getCode() returns the modified code');
 
 // ->setFile() ->getFile()
 $t->diag('->setFile() ->getFile()');
-$m = new sfClassManipulator($source);
+$m = new \sfClassManipulator($source);
 $m->setFile('foo');
 $t->is($m->getFile(), 'foo', '->setFile() sets the name of the file associated with the source code');
 
@@ -135,12 +136,12 @@ function baz()
 $t->diag('::fromFile()');
 $file = sys_get_temp_dir().'/sf_tmp.php';
 file_put_contents($file, $source);
-$m = sfClassManipulator::fromFile($file);
+$m = \sfClassManipulator::fromFile($file);
 $t->is($m->getFile(), $file, '::fromFile() sets the file internally');
 
 // ->save()
 $t->diag('->save()');
-$m = sfClassManipulator::fromFile($file);
+$m = \sfClassManipulator::fromFile($file);
 $m->wrapMethod('foo', '', '// code after');
 $m->save();
 $t->is(fix_linebreaks(file_get_contents($file)), fix_linebreaks($sourceWithCodeAfter), '->save() saves the modified code if a file is associated with the instance');
@@ -152,7 +153,7 @@ function baz()
 
 class MethodFilterer
 {
-    public $lines = array();
+    public $lines = [];
 
     public function filter1($line)
     {
@@ -163,16 +164,16 @@ public function filter1($line)
 
     public function filter2($line)
     {
-        return str_replace(array(
+        return str_replace([
             'if (true)',
             'function foo()',
-        ), array(
+        ], [
             'if (false)',
             'function foo($arg)',
-        ), $line);
+        ], $line);
     }
 }
-$f = new MethodFilterer();
+$f = new \MethodFilterer();
 
 $sourceFiltered = <<<'EOF'
 <?php
@@ -209,11 +210,11 @@ function baz()
 // CRLF
 $t->diag('CRLF');
 
-$m = new sfClassManipulator($sourceCRLF);
-$f->lines = array();
-$m->filterMethod('foo', array($f, 'filter1'));
+$m = new \sfClassManipulator($sourceCRLF);
+$f->lines = [];
+$m->filterMethod('foo', [$f, 'filter1']);
 $t->is($m->getCode(), $sourceCRLF, '->filterMethod() does not change the code if the filter does nothing');
-$t->is_deeply($f->lines, array(
+$t->is_deeply($f->lines, [
     "  function foo()\r\n",
     "  {\r\n",
     "    if (true)\r\n",
@@ -221,18 +222,18 @@ function baz()
     "      return;\r\n",
     "    }\r\n",
     '  }',
-), '->filterMethod() filters each line of the method');
-$m->filterMethod('foo', array($f, 'filter2'));
+], '->filterMethod() filters each line of the method');
+$m->filterMethod('foo', [$f, 'filter2']);
 $t->is($m->getCode(), $sourceFilteredCRLF, '->filterMethod() modifies the method');
 
 // LF
 $t->diag('LF');
 
-$m = new sfClassManipulator($sourceLF);
-$f->lines = array();
-$m->filterMethod('foo', array($f, 'filter1'));
+$m = new \sfClassManipulator($sourceLF);
+$f->lines = [];
+$m->filterMethod('foo', [$f, 'filter1']);
 $t->is($m->getCode(), $sourceLF, '->filterMethod() does not change the code if the filter does nothing');
-$t->is_deeply($f->lines, array(
+$t->is_deeply($f->lines, [
     "  function foo()\n",
     "  {\n",
     "    if (true)\n",
@@ -240,28 +241,28 @@ function baz()
     "      return;\n",
     "    }\n",
     '  }',
-), '->filterMethod() filters each line of the method');
-$m->filterMethod('foo', array($f, 'filter2'));
+], '->filterMethod() filters each line of the method');
+$m->filterMethod('foo', [$f, 'filter2']);
 $t->is($m->getCode(), $sourceFilteredLF, '->filterMethod() modifies the method');
 
 // no EOL
 $t->diag('no EOL');
 
 $sourceFlat = '<?php class Foo { function foo() { if (true) { return; } } function baz() { if (true) { return; } } }';
-$m = new sfClassManipulator($sourceFlat);
-$f->lines = array();
-$m->filterMethod('foo', array($f, 'filter1'));
-$t->is_deeply($f->lines, array('function foo() { if (true) { return; } }'), '->filterMethod() works when there are no line breaks');
+$m = new \sfClassManipulator($sourceFlat);
+$f->lines = [];
+$m->filterMethod('foo', [$f, 'filter1']);
+$t->is_deeply($f->lines, ['function foo() { if (true) { return; } }'], '->filterMethod() works when there are no line breaks');
 $t->is($m->getCode(), $sourceFlat, '->filterMethod() works when there are no line breaks');
 
 // mixed EOL
 $t->diag('mixed EOL');
 
 $sourceMixed = "<?php\r\n\nclass Foo\r\n{\n  function foo()\r\n  {\n    if (true)\r\n    {\n      return;\r\n    }\n  }\r\n\n  function baz()\r\n  {\n    if (true)\r\n    {\n      return;\r\n    }\n  }\r\n}";
-$m = new sfClassManipulator($sourceMixed);
-$f->lines = array();
-$m->filterMethod('foo', array($f, 'filter1'));
-$t->is_deeply($f->lines, array(
+$m = new \sfClassManipulator($sourceMixed);
+$f->lines = [];
+$m->filterMethod('foo', [$f, 'filter1']);
+$t->is_deeply($f->lines, [
     "  function foo()\r\n",
     "  {\n",
     "    if (true)\r\n",
@@ -269,4 +270,4 @@ function baz()
     "      return;\r\n",
     "    }\n",
     '  }',
-), '->filterMethod() filters each line of a mixed EOL-style method');
+], '->filterMethod() filters each line of a mixed EOL-style method');
diff --git a/test/unit/util/sfContextTest.php b/test/unit/util/sfContextTest.php
index 27746aac1..8a8e98912 100644
--- a/test/unit/util/sfContextTest.php
+++ b/test/unit/util/sfContextTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(29);
+$t = new \lime_test(29);
 
-class myContext extends sfContext
+class myContext extends \sfContext
 {
-    public function initialize(sfApplicationConfiguration $configuration)
+    public function initialize(\sfApplicationConfiguration $configuration)
     {
     }
 }
@@ -35,32 +36,32 @@ class frontendConfiguration extends sfApplicationConfiguration
 // use functional project configruration
 require_once realpath(__DIR__.'/../../functional/fixtures/config/ProjectConfiguration.class.php');
 
-$frontend_context = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('frontend', 'test', true));
-$frontend_context_prod = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', false));
-$i18n_context = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('i18n', 'test', true));
-$cache_context = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('cache', 'test', true));
+$frontend_context = \sfContext::createInstance(\ProjectConfiguration::getApplicationConfiguration('frontend', 'test', true));
+$frontend_context_prod = \sfContext::createInstance(\ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', false));
+$i18n_context = \sfContext::createInstance(\ProjectConfiguration::getApplicationConfiguration('i18n', 'test', true));
+$cache_context = \sfContext::createInstance(\ProjectConfiguration::getApplicationConfiguration('cache', 'test', true));
 
 // ::getInstance()
 $t->diag('::getInstance()');
 $t->isa_ok($frontend_context, 'sfContext', '::createInstance() takes an application configuration and returns application context instance');
-$t->isa_ok(sfContext::getInstance('frontend'), 'sfContext', '::createInstance() creates application name context instance');
+$t->isa_ok(\sfContext::getInstance('frontend'), 'sfContext', '::createInstance() creates application name context instance');
 
-$context = sfContext::getInstance('frontend');
-$context1 = sfContext::getInstance('i18n');
-$context2 = sfContext::getInstance('cache');
-$t->is(sfContext::getInstance('i18n'), $context1, '::getInstance() returns the named context if it already exists');
+$context = \sfContext::getInstance('frontend');
+$context1 = \sfContext::getInstance('i18n');
+$context2 = \sfContext::getInstance('cache');
+$t->is(\sfContext::getInstance('i18n'), $context1, '::getInstance() returns the named context if it already exists');
 
 // ::switchTo();
 $t->diag('::switchTo()');
-sfContext::switchTo('i18n');
-$t->is(sfContext::getInstance(), $context1, '::switchTo() changes the default context instance returned by ::getInstance()');
-sfContext::switchTo('cache');
-$t->is(sfContext::getInstance(), $context2, '::switchTo() changes the default context instance returned by ::getInstance()');
+\sfContext::switchTo('i18n');
+$t->is(\sfContext::getInstance(), $context1, '::switchTo() changes the default context instance returned by ::getInstance()');
+\sfContext::switchTo('cache');
+$t->is(\sfContext::getInstance(), $context2, '::switchTo() changes the default context instance returned by ::getInstance()');
 
 // ->get() ->set() ->has()
 $t->diag('->get() ->set() ->has()');
 $t->is($context1->has('object'), false, '->has() returns false if no object of the given name exist');
-$object = new stdClass();
+$object = new \stdClass();
 $context1->set('object', $object, '->set() stores an object in the current context instance');
 $t->is($context1->has('object'), true, '->has() returns true if an object is stored for the given name');
 $t->is($context1->get('object'), $object, '->get() returns the object associated with the given name');
@@ -68,7 +69,7 @@ class frontendConfiguration extends sfApplicationConfiguration
 try {
     $context1->get('object1');
     $t->fail('->get() throws an sfException if no object is stored for the given name');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->get() throws an sfException if no object is stored for the given name');
 }
 
@@ -93,15 +94,15 @@ class frontendConfiguration extends sfApplicationConfiguration
 try {
     $context->unknown();
     $t->fail('->__call() throws an sfException if factory / method does not exist');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->__call() throws an sfException if factory / method does not exist');
 }
 
 $t->diag('->getServiceContainer() test');
 $sc = $frontend_context->getServiceContainer();
-$t->ok(file_exists(sfConfig::get('sf_cache_dir').'/frontend/test/config/config_services.yml.php'), '->getServiceContainer() creates a cache file in /cache/frontend/test/config');
+$t->ok(file_exists(\sfConfig::get('sf_cache_dir').'/frontend/test/config/config_services.yml.php'), '->getServiceContainer() creates a cache file in /cache/frontend/test/config');
 $t->ok(class_exists('frontend_testServiceContainer'), '->getServiceContainer() creates and loads the frontend_testServiceContainer class');
-$t->ok($sc instanceof frontend_testServiceContainer, '->getServiceContainer() returns an instance of frontend_testServiceContainer');
+$t->ok($sc instanceof \frontend_testServiceContainer, '->getServiceContainer() returns an instance of frontend_testServiceContainer');
 $t->ok($sc->hasService('my_app_service'), '->getServiceContainer() contains app/config/service.yml services');
 $t->ok($sc->hasService('my_project_service'), '->getServiceContainer() contains /config/service.yml services');
 $t->ok($sc->hasService('my_plugin_service'), '->getServiceContainer() contains plugin/config/service.yml services');
@@ -110,7 +111,7 @@ class frontendConfiguration extends sfApplicationConfiguration
 
 $t->diag('->getServiceContainer() prod');
 $sc = $frontend_context_prod->getServiceContainer();
-$t->ok(file_exists(sfConfig::get('sf_cache_dir').'/frontend/prod/config/config_services.yml.php'), '->getServiceContainer() creates a cache file in /cache/frontend/prod/config');
+$t->ok(file_exists(\sfConfig::get('sf_cache_dir').'/frontend/prod/config/config_services.yml.php'), '->getServiceContainer() creates a cache file in /cache/frontend/prod/config');
 $t->ok(class_exists('frontend_prodServiceContainer'), '->getServiceContainer() creates and loads the frontend_prodServiceContainer class');
-$t->ok($sc instanceof frontend_prodServiceContainer, '->getServiceContainer() returns an instance of frontend_prodServiceContainer');
+$t->ok($sc instanceof \frontend_prodServiceContainer, '->getServiceContainer() returns an instance of frontend_prodServiceContainer');
 $t->ok(false === $sc->hasParameter('my_app_test_param'), '->getServiceContainer() does not contain other env specifiv parameters');
diff --git a/test/unit/util/sfDomCssSelectorTest.php b/test/unit/util/sfDomCssSelectorTest.php
index c307b3de8..6c45bdffd 100644
--- a/test/unit/util/sfDomCssSelectorTest.php
+++ b/test/unit/util/sfDomCssSelectorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(72);
+$t = new \lime_test(72);
 
 $html = <<<'EOF'
 <html>
@@ -78,91 +79,91 @@
 </html>
 EOF;
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 $dom->loadHTML($html);
 
-$c = new sfDomCssSelector($dom);
+$c = new \sfDomCssSelector($dom);
 
 // ->matchAll()
 $t->diag('->matchAll()');
 
 $t->diag('basic selectors');
-$t->is($c->matchAll('h1')->getValues(), array('Test page'), '->matchAll() takes a CSS selector as its first argument');
-$t->is($c->matchAll('h2')->getValues(), array('Title 1', 'Title 2'), '->matchAll() returns an array of matching texts');
-$t->is($c->matchAll('#footer')->getValues(), array('footer'), '->matchAll() supports searching html elements by id');
-$t->is($c->matchAll('div#footer')->getValues(), array('footer'), '->matchAll() supports searching html elements by id for a tag name');
-$t->is($c->matchAll('*[class="myfoo"]')->getValues(), array('myfoo', 'myfoo bis'), '->matchAll() can take a * to match every elements');
-$t->is($c->matchAll('*[class=myfoo]')->getValues(), array('myfoo', 'myfoo bis'), '->matchAll() can take a * to match every elements');
-$t->is($c->matchAll('*[value="0"]')->getValues(), array('foo input'), '->matchAll() can take a * to match every elements');
+$t->is($c->matchAll('h1')->getValues(), ['Test page'], '->matchAll() takes a CSS selector as its first argument');
+$t->is($c->matchAll('h2')->getValues(), ['Title 1', 'Title 2'], '->matchAll() returns an array of matching texts');
+$t->is($c->matchAll('#footer')->getValues(), ['footer'], '->matchAll() supports searching html elements by id');
+$t->is($c->matchAll('div#footer')->getValues(), ['footer'], '->matchAll() supports searching html elements by id for a tag name');
+$t->is($c->matchAll('*[class="myfoo"]')->getValues(), ['myfoo', 'myfoo bis'], '->matchAll() can take a * to match every elements');
+$t->is($c->matchAll('*[class=myfoo]')->getValues(), ['myfoo', 'myfoo bis'], '->matchAll() can take a * to match every elements');
+$t->is($c->matchAll('*[value="0"]')->getValues(), ['foo input'], '->matchAll() can take a * to match every elements');
 
-$t->is($c->matchAll('.header')->getValues(), array('header'), '->matchAll() supports searching html elements by class name');
-$t->is($c->matchAll('p.header')->getValues(), array('header'), '->matchAll() supports searching html elements by class name for a tag name');
-$t->is($c->matchAll('div.header')->getValues(), array(), '->matchAll() supports searching html elements by class name for a tag name');
-$t->is($c->matchAll('*.header')->getValues(), array('header'), '->matchAll() supports searching html elements by class name');
+$t->is($c->matchAll('.header')->getValues(), ['header'], '->matchAll() supports searching html elements by class name');
+$t->is($c->matchAll('p.header')->getValues(), ['header'], '->matchAll() supports searching html elements by class name for a tag name');
+$t->is($c->matchAll('div.header')->getValues(), [], '->matchAll() supports searching html elements by class name for a tag name');
+$t->is($c->matchAll('*.header')->getValues(), ['header'], '->matchAll() supports searching html elements by class name');
 
-$t->is($c->matchAll('.foo')->getValues(), array('multi-classes'), '->matchAll() supports searching html elements by class name for multi-class elements');
-$t->is($c->matchAll('.bar')->getValues(), array('multi-classes'), '->matchAll() supports searching html elements by class name for multi-class elements');
-$t->is($c->matchAll('.foobar')->getValues(), array('multi-classes'), '->matchAll() supports searching html elements by class name for multi-class elements');
+$t->is($c->matchAll('.foo')->getValues(), ['multi-classes'], '->matchAll() supports searching html elements by class name for multi-class elements');
+$t->is($c->matchAll('.bar')->getValues(), ['multi-classes'], '->matchAll() supports searching html elements by class name for multi-class elements');
+$t->is($c->matchAll('.foobar')->getValues(), ['multi-classes'], '->matchAll() supports searching html elements by class name for multi-class elements');
 
-$t->is($c->matchAll('ul#mylist ul li')->getValues(), array('element 3', 'element 4'), '->matchAll() supports searching html elements by several selectors');
+$t->is($c->matchAll('ul#mylist ul li')->getValues(), ['element 3', 'element 4'], '->matchAll() supports searching html elements by several selectors');
 
-$t->is($c->matchAll('#nonexistant')->getValues(), array(), '->matchAll() returns an empty array if the id does not exist');
+$t->is($c->matchAll('#nonexistant')->getValues(), [], '->matchAll() returns an empty array if the id does not exist');
 
-$t->is($c->matchAll('.bar1-foo1')->getValues(), array('link', 'another link'), 'Hyphenated class names are matched correctly');
+$t->is($c->matchAll('.bar1-foo1')->getValues(), ['link', 'another link'], 'Hyphenated class names are matched correctly');
 
 $t->diag('attribute selectors');
-$t->is($c->matchAll('ul#list li a[href]')->getValues(), array('link'), '->matchAll() supports checking attribute existence');
-$t->is($c->matchAll('ul#list li a[class~="foo1"]')->getValues(), array('link'), '->matchAll() supports checking attribute word matching');
-$t->is($c->matchAll('ul#list li a[class~="bar1"]')->getValues(), array('link'), '->matchAll() supports checking attribute word matching');
-$t->is($c->matchAll('ul#list li a[class~="foobar1"]')->getValues(), array('link'), '->matchAll() supports checking attribute word matching');
-$t->is($c->matchAll('ul#list li a[class^="foo1"]')->getValues(), array('link'), '->matchAll() supports checking attribute starting with');
-$t->is($c->matchAll('ul#list li a[class$="foobar1"]')->getValues(), array('link'), '->matchAll() supports checking attribute ending with');
-$t->is($c->matchAll('ul#list li a[class*="oba"]')->getValues(), array('link'), '->matchAll() supports checking attribute with *');
-$t->is($c->matchAll('ul#list li a[href="http://www.google.com/"]')->getValues(), array('link'), '->matchAll() supports checking attribute word matching');
-$t->is($c->matchAll('ul#anotherlist li a[class|="bar1"]')->getValues(), array('another link'), '->matchAll() supports checking attribute starting with value followed by optional hyphen');
+$t->is($c->matchAll('ul#list li a[href]')->getValues(), ['link'], '->matchAll() supports checking attribute existence');
+$t->is($c->matchAll('ul#list li a[class~="foo1"]')->getValues(), ['link'], '->matchAll() supports checking attribute word matching');
+$t->is($c->matchAll('ul#list li a[class~="bar1"]')->getValues(), ['link'], '->matchAll() supports checking attribute word matching');
+$t->is($c->matchAll('ul#list li a[class~="foobar1"]')->getValues(), ['link'], '->matchAll() supports checking attribute word matching');
+$t->is($c->matchAll('ul#list li a[class^="foo1"]')->getValues(), ['link'], '->matchAll() supports checking attribute starting with');
+$t->is($c->matchAll('ul#list li a[class$="foobar1"]')->getValues(), ['link'], '->matchAll() supports checking attribute ending with');
+$t->is($c->matchAll('ul#list li a[class*="oba"]')->getValues(), ['link'], '->matchAll() supports checking attribute with *');
+$t->is($c->matchAll('ul#list li a[href="http://www.google.com/"]')->getValues(), ['link'], '->matchAll() supports checking attribute word matching');
+$t->is($c->matchAll('ul#anotherlist li a[class|="bar1"]')->getValues(), ['another link'], '->matchAll() supports checking attribute starting with value followed by optional hyphen');
 
-$t->is($c->matchAll('ul#list li a[class*="oba"][class*="ba"]')->getValues(), array('link'), '->matchAll() supports chaining attribute selectors');
-$t->is($c->matchAll('p[class="myfoo"][id="mybar"]')->getValues(), array('myfoo bis'), '->matchAll() supports chaining attribute selectors');
+$t->is($c->matchAll('ul#list li a[class*="oba"][class*="ba"]')->getValues(), ['link'], '->matchAll() supports chaining attribute selectors');
+$t->is($c->matchAll('p[class="myfoo"][id="mybar"]')->getValues(), ['myfoo bis'], '->matchAll() supports chaining attribute selectors');
 
-$t->is($c->matchAll('p[onclick*="a . and a #"]')->getValues(), array('works great'), '->matchAll() support . # and spaces in attribute selectors');
+$t->is($c->matchAll('p[onclick*="a . and a #"]')->getValues(), ['works great'], '->matchAll() support . # and spaces in attribute selectors');
 
 $t->diag('combinators');
-$t->is($c->matchAll('body  h1')->getValues(), array('Test page'), '->matchAll() takes a CSS selectors separated by one or more spaces');
-$t->is($c->matchAll('div#combinators > ul  >   li')->getValues(), array('test 1', 'test 2'), '->matchAll() support > combinator');
-$t->is($c->matchAll('div#combinators>ul>li')->getValues(), array('test 1', 'test 2'), '->matchAll() support > combinator with optional surrounding spaces');
-$t->is($c->matchAll('div#combinators li  +   li')->getValues(), array('test 2', 'test 4'), '->matchAll() support + combinator');
-$t->is($c->matchAll('div#combinators li+li')->getValues(), array('test 2', 'test 4'), '->matchAll() support + combinator with optional surrounding spaces');
-
-$t->is($c->matchAll('h1, h2')->getValues(), array('Test page', 'Title 1', 'Title 2'), '->matchAll() takes a multiple CSS selectors separated by a ,');
-$t->is($c->matchAll('h1,h2')->getValues(), array('Test page', 'Title 1', 'Title 2'), '->matchAll() takes a multiple CSS selectors separated by a ,');
-$t->is($c->matchAll('h1  ,   h2')->getValues(), array('Test page', 'Title 1', 'Title 2'), '->matchAll() takes a multiple CSS selectors separated by a ,');
-$t->is($c->matchAll('h1, h1,h1')->getValues(), array('Test page'), '->matchAll() returns nodes only once for multiple selectors');
-$t->is($c->matchAll('h1,h2,h1')->getValues(), array('Test page', 'Title 1', 'Title 2'), '->matchAll() returns nodes only once for multiple selectors');
-
-$t->is($c->matchAll('p[onclick*="a . and a #"], div#combinators > ul li + li')->getValues(), array('works great', 'test 2', 'test 4'), '->matchAll() mega example!');
-
-$t->is($c->matchAll('.myfoo:contains("bis")')->getValues(), array('myfoo bis'), '->matchAll() :contains()');
-$t->is($c->matchAll('.myfoo:eq(1)')->getValues(), array('myfoo bis'), '->matchAll() :eq()');
-$t->is($c->matchAll('.myfoo:last')->getValues(), array('myfoo bis'), '->matchAll() :last');
-$t->is($c->matchAll('.myfoo:first')->getValues(), array('myfoo'), '->matchAll() :first');
-$t->is($c->matchAll('h2:first')->getValues(), array('Title 1'), '->matchAll() :first');
-$t->is($c->matchAll('p.myfoo:first')->getValues(), array('myfoo'), '->matchAll() :first');
-$t->is($c->matchAll('p:lt(2)')->getValues(), array('header', 'multi-classes'), '->matchAll() :lt');
-$t->is($c->matchAll('p:gt(2)')->getValues(), array('myfoo bis', 'works great', 'First paragraph', 'Second paragraph', 'Third paragraph'), '->matchAll() :gt');
-$t->is($c->matchAll('p:odd')->getValues(), array('multi-classes', 'myfoo bis', 'First paragraph', 'Third paragraph'), '->matchAll() :odd');
-$t->is($c->matchAll('p:even')->getValues(), array('header', 'myfoo', 'works great', 'Second paragraph'), '->matchAll() :even');
-$t->is($c->matchAll('#simplelist li:first-child')->getValues(), array('First', 'First'), '->matchAll() :first-child');
-$t->is($c->matchAll('#simplelist li:nth-child(1)')->getValues(), array('First', 'First'), '->matchAll() :nth-child');
-$t->is($c->matchAll('#simplelist li:nth-child(2)')->getValues(), array('Second with a link', 'Second'), '->matchAll() :nth-child');
-$t->is($c->matchAll('#simplelist li:nth-child(3)')->getValues(), array('Third with another link'), '->matchAll() :nth-child');
-$t->is($c->matchAll('#simplelist li:last-child')->getValues(), array('Second with a link', 'Third with another link'), '->matchAll() :last-child');
+$t->is($c->matchAll('body  h1')->getValues(), ['Test page'], '->matchAll() takes a CSS selectors separated by one or more spaces');
+$t->is($c->matchAll('div#combinators > ul  >   li')->getValues(), ['test 1', 'test 2'], '->matchAll() support > combinator');
+$t->is($c->matchAll('div#combinators>ul>li')->getValues(), ['test 1', 'test 2'], '->matchAll() support > combinator with optional surrounding spaces');
+$t->is($c->matchAll('div#combinators li  +   li')->getValues(), ['test 2', 'test 4'], '->matchAll() support + combinator');
+$t->is($c->matchAll('div#combinators li+li')->getValues(), ['test 2', 'test 4'], '->matchAll() support + combinator with optional surrounding spaces');
+
+$t->is($c->matchAll('h1, h2')->getValues(), ['Test page', 'Title 1', 'Title 2'], '->matchAll() takes a multiple CSS selectors separated by a ,');
+$t->is($c->matchAll('h1,h2')->getValues(), ['Test page', 'Title 1', 'Title 2'], '->matchAll() takes a multiple CSS selectors separated by a ,');
+$t->is($c->matchAll('h1  ,   h2')->getValues(), ['Test page', 'Title 1', 'Title 2'], '->matchAll() takes a multiple CSS selectors separated by a ,');
+$t->is($c->matchAll('h1, h1,h1')->getValues(), ['Test page'], '->matchAll() returns nodes only once for multiple selectors');
+$t->is($c->matchAll('h1,h2,h1')->getValues(), ['Test page', 'Title 1', 'Title 2'], '->matchAll() returns nodes only once for multiple selectors');
+
+$t->is($c->matchAll('p[onclick*="a . and a #"], div#combinators > ul li + li')->getValues(), ['works great', 'test 2', 'test 4'], '->matchAll() mega example!');
+
+$t->is($c->matchAll('.myfoo:contains("bis")')->getValues(), ['myfoo bis'], '->matchAll() :contains()');
+$t->is($c->matchAll('.myfoo:eq(1)')->getValues(), ['myfoo bis'], '->matchAll() :eq()');
+$t->is($c->matchAll('.myfoo:last')->getValues(), ['myfoo bis'], '->matchAll() :last');
+$t->is($c->matchAll('.myfoo:first')->getValues(), ['myfoo'], '->matchAll() :first');
+$t->is($c->matchAll('h2:first')->getValues(), ['Title 1'], '->matchAll() :first');
+$t->is($c->matchAll('p.myfoo:first')->getValues(), ['myfoo'], '->matchAll() :first');
+$t->is($c->matchAll('p:lt(2)')->getValues(), ['header', 'multi-classes'], '->matchAll() :lt');
+$t->is($c->matchAll('p:gt(2)')->getValues(), ['myfoo bis', 'works great', 'First paragraph', 'Second paragraph', 'Third paragraph'], '->matchAll() :gt');
+$t->is($c->matchAll('p:odd')->getValues(), ['multi-classes', 'myfoo bis', 'First paragraph', 'Third paragraph'], '->matchAll() :odd');
+$t->is($c->matchAll('p:even')->getValues(), ['header', 'myfoo', 'works great', 'Second paragraph'], '->matchAll() :even');
+$t->is($c->matchAll('#simplelist li:first-child')->getValues(), ['First', 'First'], '->matchAll() :first-child');
+$t->is($c->matchAll('#simplelist li:nth-child(1)')->getValues(), ['First', 'First'], '->matchAll() :nth-child');
+$t->is($c->matchAll('#simplelist li:nth-child(2)')->getValues(), ['Second with a link', 'Second'], '->matchAll() :nth-child');
+$t->is($c->matchAll('#simplelist li:nth-child(3)')->getValues(), ['Third with another link'], '->matchAll() :nth-child');
+$t->is($c->matchAll('#simplelist li:last-child')->getValues(), ['Second with a link', 'Third with another link'], '->matchAll() :last-child');
 
 $t->diag('combinations of pseudo-selectors');
-$t->is($c->matchAll('.myfoo:contains("myfoo"):contains("bis")')->getValues(), array('myfoo bis'), '->matchAll() :contains():contains()');
-$t->is($c->matchAll('.myfoo:contains("myfoo"):last')->getValues(), array('myfoo bis'), '->matchAll() :contains():last');
-$t->is($c->matchAll('.myfoo:last:contains("foobarbaz")')->getValues(), array(), '->matchAll() :last:contains()');
-$t->is($c->matchAll('.myfoo:contains("myfoo"):contains(\'bis\'):contains(foo)')->getValues(), array('myfoo bis'), '->matchAll() :contains() supports different quote styles');
+$t->is($c->matchAll('.myfoo:contains("myfoo"):contains("bis")')->getValues(), ['myfoo bis'], '->matchAll() :contains():contains()');
+$t->is($c->matchAll('.myfoo:contains("myfoo"):last')->getValues(), ['myfoo bis'], '->matchAll() :contains():last');
+$t->is($c->matchAll('.myfoo:last:contains("foobarbaz")')->getValues(), [], '->matchAll() :last:contains()');
+$t->is($c->matchAll('.myfoo:contains("myfoo"):contains(\'bis\'):contains(foo)')->getValues(), ['myfoo bis'], '->matchAll() :contains() supports different quote styles');
 
 // ->matchAll()
 $t->diag('->matchAll()');
@@ -170,21 +171,21 @@
 
 // ->matchSingle()
 $t->diag('->matchSingle()');
-$t->is(array($c->matchAll('ul li')->getValue()), $c->matchSingle('ul li')->getValues(), '->matchSingle() returns a new sfDomCssSelector restricted to the first result node');
+$t->is([$c->matchAll('ul li')->getValue()], $c->matchSingle('ul li')->getValues(), '->matchSingle() returns a new sfDomCssSelector restricted to the first result node');
 
 // ->getValues()
 $t->diag('->getValues()');
-$t->is($c->matchAll('p.myfoo')->getValues(), array('myfoo', 'myfoo bis'), '->getValues() returns all node values');
+$t->is($c->matchAll('p.myfoo')->getValues(), ['myfoo', 'myfoo bis'], '->getValues() returns all node values');
 
 // ->getValue()
 $t->diag('->getValue()');
 $t->is($c->matchAll('h1')->getValue(), 'Test page', '->getValue() returns the first node value');
 
-$t->is($c->matchAll('#adjacent_bug > p')->getValues(), array('First paragraph', 'Second paragraph', 'Third paragraph'), '->matchAll() suppports the + combinator');
-$t->is($c->matchAll('#adjacent_bug > p > a')->getValues(), array('paragraph'), '->matchAll() suppports the + combinator');
-$t->is($c->matchAll('#adjacent_bug p + p')->getValues(), array('Second paragraph', 'Third paragraph'), '->matchAll() suppports the + combinator');
-$t->is($c->matchAll('#adjacent_bug > p + p')->getValues(), array('Second paragraph', 'Third paragraph'), '->matchAll() suppports the + combinator');
-$t->is($c->matchAll('#adjacent_bug > p + p > a')->getValues(), array('paragraph'), '->matchAll() suppports the + combinator');
+$t->is($c->matchAll('#adjacent_bug > p')->getValues(), ['First paragraph', 'Second paragraph', 'Third paragraph'], '->matchAll() suppports the + combinator');
+$t->is($c->matchAll('#adjacent_bug > p > a')->getValues(), ['paragraph'], '->matchAll() suppports the + combinator');
+$t->is($c->matchAll('#adjacent_bug p + p')->getValues(), ['Second paragraph', 'Third paragraph'], '->matchAll() suppports the + combinator');
+$t->is($c->matchAll('#adjacent_bug > p + p')->getValues(), ['Second paragraph', 'Third paragraph'], '->matchAll() suppports the + combinator');
+$t->is($c->matchAll('#adjacent_bug > p + p > a')->getValues(), ['paragraph'], '->matchAll() suppports the + combinator');
 
 // Iterator interface
 $t->diag('Iterator interface');
diff --git a/test/unit/util/sfFinderTest.php b/test/unit/util/sfFinderTest.php
index 82119f99e..0c59f137c 100644
--- a/test/unit/util/sfFinderTest.php
+++ b/test/unit/util/sfFinderTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class my_lime_test extends lime_test
+class my_lime_test extends \lime_test
 {
     public function arrays_are_equal($a, $b, $message)
     {
@@ -20,35 +21,35 @@ public function arrays_are_equal($a, $b, $message)
         return $this->is($a, $b, $message);
     }
 }
-$t = new my_lime_test(39);
+$t = new \my_lime_test(39);
 
 require_once $_test_dir.'/../lib/util/sfFinder.class.php';
 
 $fixtureDir = __DIR__.'/fixtures/finder';
-$phpFiles = array(
+$phpFiles = [
     'dir1/dir2/file21.php',
     'dir1/file12.php',
-);
-$txtFiles = array(
+];
+$txtFiles = [
     'FILE5.txt',
     'file2.txt',
-);
-$regexpFiles = array(
+];
+$regexpFiles = [
     'dir1/dir2/file21.php',
     'dir1/dir2/file22',
     'dir1/dir2/file23',
     'dir1/dir2/file24',
     'file2.txt',
-);
-$regexpWithModifierFiles = array(
+];
+$regexpWithModifierFiles = [
     'dir1/dir2/file21.php',
     'dir1/dir2/file22',
     'dir1/dir2/file23',
     'dir1/dir2/file24',
     'FILE5.txt',
     'file2.txt',
-);
-$allFiles = array(
+];
+$allFiles = [
     'dir1/dir2/dir3/file31',
     'dir1/dir2/dir4/file41',
     'dir1/dir2/file21.php',
@@ -61,8 +62,8 @@ public function arrays_are_equal($a, $b, $message)
     'file1',
     'FILE5.txt',
     'file2.txt',
-);
-$minDepth1Files = array(
+];
+$minDepth1Files = [
     'dir1/dir2/dir3/file31',
     'dir1/dir2/dir4/file41',
     'dir1/dir2/file21.php',
@@ -72,8 +73,8 @@ public function arrays_are_equal($a, $b, $message)
     'dir1/file11',
     'dir1/file12.php',
     'dir1/file13',
-);
-$maxDepth2Files = array(
+];
+$maxDepth2Files = [
     'dir1/dir2/file21.php',
     'dir1/dir2/file22',
     'dir1/dir2/file23',
@@ -84,8 +85,8 @@ public function arrays_are_equal($a, $b, $message)
     'file1',
     'FILE5.txt',
     'file2.txt',
-);
-$anyWithoutDir2 = array(
+];
+$anyWithoutDir2 = [
     'dir1',
     'dir1/dir2',
     'dir1/file11',
@@ -94,108 +95,108 @@ public function arrays_are_equal($a, $b, $message)
     'file1',
     'FILE5.txt',
     'file2.txt',
-);
+];
 
 // ::type()
 $t->diag('::type()');
-$finder = sfFinder::type('file');
-$t->ok($finder instanceof sfFinder, '::type() returns a sfFinder instance');
+$finder = \sfFinder::type('file');
+$t->ok($finder instanceof \sfFinder, '::type() returns a sfFinder instance');
 $t->is($finder->get_type(), 'file', '::type() takes a file, dir, or any as its first argument');
-$finder = sfFinder::type('dir');
+$finder = \sfFinder::type('dir');
 $t->is($finder->get_type(), 'directory', '::type() takes a file, dir, or any as its first argument');
-$finder = sfFinder::type('any');
+$finder = \sfFinder::type('any');
 $t->is($finder->get_type(), 'any', '::type() takes a file, dir, or any as its first argument');
-$finder = sfFinder::type('somethingelse');
+$finder = \sfFinder::type('somethingelse');
 $t->is($finder->get_type(), 'file', '::type() takes a file, dir, or any as its first argument');
 
 // ->setType() ->get_type()
 $t->diag('->setType() ->get_type()');
-$finder = sfFinder::type('file');
+$finder = \sfFinder::type('file');
 $finder->setType('dir');
 $t->is($finder->get_type(), 'directory', '->getType() returns the type of searched files');
 $t->is($finder->setType('file'), $finder, '->setType() implements a fluent interface');
 
 // ->name()
 $t->diag('->name()');
-$finder = sfFinder::type('file');
+$finder = \sfFinder::type('file');
 $t->is($finder->name('*.php'), $finder, '->name() implements the fluent interface');
 
 $t->diag('->name() file name support');
-$finder = sfFinder::type('file')->name('file21.php')->relative();
-$t->arrays_are_equal($finder->in($fixtureDir), array('dir1/dir2/file21.php'), '->name() can take a file name as an argument');
+$finder = \sfFinder::type('file')->name('file21.php')->relative();
+$t->arrays_are_equal($finder->in($fixtureDir), ['dir1/dir2/file21.php'], '->name() can take a file name as an argument');
 
 $t->diag('->name() globs support');
-$finder = sfFinder::type('file')->name('*.php')->relative();
+$finder = \sfFinder::type('file')->name('*.php')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), $phpFiles, '->name() can take a glob pattern as an argument');
 
 $t->diag('->name() regexp support');
-$finder = sfFinder::type('file')->name('/^file2.*$/')->relative();
+$finder = \sfFinder::type('file')->name('/^file2.*$/')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), $regexpFiles, '->name() can take a regexp as an argument');
 
 $t->diag('->name() regexp support with modifier');
-$finder = sfFinder::type('file')->name('/^file(2|5).*$/i')->relative();
+$finder = \sfFinder::type('file')->name('/^file(2|5).*$/i')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), $regexpWithModifierFiles, '->name() can take a regexp with a modifier as an argument');
 
 $t->diag('->name() array / args / chaining');
-$finder = sfFinder::type('file')->name(array('*.php', '*.txt'))->relative();
+$finder = \sfFinder::type('file')->name(['*.php', '*.txt'])->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_merge($phpFiles, $txtFiles), '->name() can take an array of patterns');
-$finder = sfFinder::type('file')->name('*.php', '*.txt')->relative();
+$finder = \sfFinder::type('file')->name('*.php', '*.txt')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_merge($phpFiles, $txtFiles), '->name() can take patterns as arguments');
-$finder = sfFinder::type('file')->name('*.php')->name('*.txt')->relative();
+$finder = \sfFinder::type('file')->name('*.php')->name('*.txt')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_merge($phpFiles, $txtFiles), '->name() can be called several times');
 
 // ->not_name()
 $t->diag('->not_name()');
-$finder = sfFinder::type('file');
+$finder = \sfFinder::type('file');
 $t->is($finder->not_name('*.php'), $finder, '->not_name() implements the fluent interface');
 
 $t->diag('->not_name() file name support');
-$finder = sfFinder::type('file')->not_name('file21.php')->relative();
-$t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, array('dir1/dir2/file21.php'))), '->not_name() can take a file name as an argument');
+$finder = \sfFinder::type('file')->not_name('file21.php')->relative();
+$t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, ['dir1/dir2/file21.php'])), '->not_name() can take a file name as an argument');
 
 $t->diag('->not_name() globs support');
-$finder = sfFinder::type('file')->not_name('*.php')->relative();
+$finder = \sfFinder::type('file')->not_name('*.php')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, $phpFiles)), '->not_name() can take a glob pattern as an argument');
 
 $t->diag('->not_name() regexp support');
-$finder = sfFinder::type('file')->not_name('/^file2.*$/')->relative();
+$finder = \sfFinder::type('file')->not_name('/^file2.*$/')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, $regexpFiles)), '->not_name() can take a regexp as an argument');
 
 $t->diag('->not_name() array / args / chaining');
-$finder = sfFinder::type('file')->not_name(array('*.php', '*.txt'))->relative();
+$finder = \sfFinder::type('file')->not_name(['*.php', '*.txt'])->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, array_merge($phpFiles, $txtFiles))), '->not_name() can take an array of patterns');
-$finder = sfFinder::type('file')->not_name('*.php', '*.txt')->relative();
+$finder = \sfFinder::type('file')->not_name('*.php', '*.txt')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, array_merge($phpFiles, $txtFiles))), '->not_name() can take patterns as arguments');
-$finder = sfFinder::type('file')->not_name('*.php')->not_name('*.txt')->relative();
+$finder = \sfFinder::type('file')->not_name('*.php')->not_name('*.txt')->relative();
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, array_merge($phpFiles, $txtFiles))), '->not_name() can be called several times');
 
 $t->diag('->name() ->not_name() in the same query');
-$finder = sfFinder::type('file')->not_name('/^file2.*$/')->name('*.php')->relative();
-$t->arrays_are_equal($finder->in($fixtureDir), array('dir1/file12.php'), '->not_name() and ->name() can be called in the same query');
+$finder = \sfFinder::type('file')->not_name('/^file2.*$/')->name('*.php')->relative();
+$t->arrays_are_equal($finder->in($fixtureDir), ['dir1/file12.php'], '->not_name() and ->name() can be called in the same query');
 
 // ->size()
 $t->diag('->size()');
-$finder = sfFinder::type('file');
+$finder = \sfFinder::type('file');
 $t->is($finder->size('> 2K'), $finder, '->size() implements the fluent interface');
 
-$finder = sfFinder::type('file')->size('> 100K')->relative();
-$t->is($finder->in($fixtureDir), array(), '->size() takes a size comparison string as its argument');
-$finder = sfFinder::type('file')->size('> 1K')->relative();
-$t->is($finder->in($fixtureDir), array('file1'), '->size() takes a size comparison string as its argument');
-$finder = sfFinder::type('file')->size('> 1K')->size('< 2K')->relative();
-$t->is($finder->in($fixtureDir), array(), '->size() takes a size comparison string as its argument');
+$finder = \sfFinder::type('file')->size('> 100K')->relative();
+$t->is($finder->in($fixtureDir), [], '->size() takes a size comparison string as its argument');
+$finder = \sfFinder::type('file')->size('> 1K')->relative();
+$t->is($finder->in($fixtureDir), ['file1'], '->size() takes a size comparison string as its argument');
+$finder = \sfFinder::type('file')->size('> 1K')->size('< 2K')->relative();
+$t->is($finder->in($fixtureDir), [], '->size() takes a size comparison string as its argument');
 
 // ->mindepth() ->maxdepth()
 $t->diag('->mindepth() ->maxdepth()');
-$finder = sfFinder::type('file');
+$finder = \sfFinder::type('file');
 $t->is($finder->mindepth(1), $finder, '->mindepth() implements the fluent interface');
 $t->is($finder->maxdepth(1), $finder, '->maxdepth() implements the fluent interface');
 
-$finder = sfFinder::type('file')->relative()->mindepth(1);
+$finder = \sfFinder::type('file')->relative()->mindepth(1);
 $t->arrays_are_equal($finder->in($fixtureDir), $minDepth1Files, '->mindepth() takes a minimum depth as its argument');
-$finder = sfFinder::type('file')->relative()->maxdepth(2);
+$finder = \sfFinder::type('file')->relative()->maxdepth(2);
 $t->arrays_are_equal($finder->in($fixtureDir), $maxDepth2Files, '->maxdepth() takes a maximum depth as its argument');
-$finder = sfFinder::type('file')->relative()->mindepth(1)->maxdepth(2);
+$finder = \sfFinder::type('file')->relative()->mindepth(1)->maxdepth(2);
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_intersect($minDepth1Files, $maxDepth2Files)), '->maxdepth() and ->mindepth() can be called in the same query');
 
 // ->discard()
@@ -203,27 +204,27 @@ public function arrays_are_equal($a, $b, $message)
 $t->is($finder->discard('file2.txt'), $finder, '->discard() implements the fluent interface');
 
 $t->diag('->discard() file name support');
-$finder = sfFinder::type('file')->relative()->discard('file2.txt');
-$t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, array('file2.txt'))), '->discard() can discard a file name');
+$finder = \sfFinder::type('file')->relative()->discard('file2.txt');
+$t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, ['file2.txt'])), '->discard() can discard a file name');
 
 $t->diag('->discard() glob support');
-$finder = sfFinder::type('file')->relative()->discard('*.php');
+$finder = \sfFinder::type('file')->relative()->discard('*.php');
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, $phpFiles)), '->discard() can discard a glob pattern');
 
 $t->diag('->discard() regexp support');
-$finder = sfFinder::type('file')->relative()->discard('/^file2.*$/');
+$finder = \sfFinder::type('file')->relative()->discard('/^file2.*$/');
 $t->arrays_are_equal($finder->in($fixtureDir), array_values(array_diff($allFiles, $regexpFiles)), '->discard() can discard a regexp pattern');
 
 // ->prune()
 $t->diag('->prune()');
 $t->is($finder->prune('dir2'), $finder, '->prune() implements the fluent interface');
 
-$finder = sfFinder::type('any')->relative()->prune('dir2');
+$finder = \sfFinder::type('any')->relative()->prune('dir2');
 $t->arrays_are_equal($finder->in($fixtureDir), $anyWithoutDir2, '->prune() ignore all files/directories under the given directory');
 
 // ->in() permissions
 $t->diag('->in() permissions');
 chmod($fixtureDir.'_permissions/secret', 0000);
-$finder = sfFinder::type('file')->relative();
-$t->arrays_are_equal($finder->in($fixtureDir.'_permissions'), array(), '->in() ignores directories it cannot read');
+$finder = \sfFinder::type('file')->relative();
+$t->arrays_are_equal($finder->in($fixtureDir.'_permissions'), [], '->in() ignores directories it cannot read');
 chmod($fixtureDir.'_permissions/secret', 0755);
diff --git a/test/unit/util/sfInflectorTest.php b/test/unit/util/sfInflectorTest.php
index db0e64281..80c91b537 100644
--- a/test/unit/util/sfInflectorTest.php
+++ b/test/unit/util/sfInflectorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,20 +15,20 @@
 
 require_once $_test_dir.'/../lib/util/sfInflector.class.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
 // ::camelize()
 $t->diag('::camelize()');
-$t->is(sfInflector::camelize('symfony'), 'Symfony', '::camelize() upper-case the first letter');
-$t->is(sfInflector::camelize('symfony_is_great'), 'SymfonyIsGreat', '::camelize() upper-case each letter after a _ and remove _');
+$t->is(\sfInflector::camelize('symfony'), 'Symfony', '::camelize() upper-case the first letter');
+$t->is(\sfInflector::camelize('symfony_is_great'), 'SymfonyIsGreat', '::camelize() upper-case each letter after a _ and remove _');
 
 // ::underscore()
 $t->diag('::underscore()');
-$t->is(sfInflector::underscore('Symfony'), 'symfony', '::underscore() lower-case the first letter');
-$t->is(sfInflector::underscore('SymfonyIsGreat'), 'symfony_is_great', '::underscore() lower-case each upper-case letter and add a _ before');
-$t->is(sfInflector::underscore('HTMLTest'), 'html_test', '::underscore() lower-case all other letters');
+$t->is(\sfInflector::underscore('Symfony'), 'symfony', '::underscore() lower-case the first letter');
+$t->is(\sfInflector::underscore('SymfonyIsGreat'), 'symfony_is_great', '::underscore() lower-case each upper-case letter and add a _ before');
+$t->is(\sfInflector::underscore('HTMLTest'), 'html_test', '::underscore() lower-case all other letters');
 
 // ::humanize()
 $t->diag('::humanize()');
-$t->is(sfInflector::humanize('symfony'), 'Symfony', '::humanize() upper-case the first letter');
-$t->is(sfInflector::humanize('symfony_is_great'), 'Symfony is great', '::humanize() replaces _ by a space');
+$t->is(\sfInflector::humanize('symfony'), 'Symfony', '::humanize() upper-case the first letter');
+$t->is(\sfInflector::humanize('symfony_is_great'), 'Symfony is great', '::humanize() replaces _ by a space');
diff --git a/test/unit/util/sfNamespacedParameterHolderTest.php b/test/unit/util/sfNamespacedParameterHolderTest.php
index 1e9005c81..2960a19e2 100644
--- a/test/unit/util/sfNamespacedParameterHolderTest.php
+++ b/test/unit/util/sfNamespacedParameterHolderTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(50);
+$t = new \lime_test(50);
 
 // ->clear()
 $t->diag('->clear()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->clear();
 $t->is($ph->getAll(), null, '->clear() clears all parameters');
 
@@ -24,41 +25,41 @@
 
 // ->get()
 $t->diag('->get()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $t->is($ph->get('foo'), 'bar', '->get() returns the parameter value for the given key');
 $t->is($ph->get('bar'), null, '->get() returns null if the key does not exist');
 
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $t->is('default_value', $ph->get('foo1', 'default_value'), '->get() takes the default value as its second argument');
 
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
 $t->is('bar', $ph->get('myfoo', null, 'symfony/mynamespace'), '->get() takes an optional namespace as its third argument');
 $t->is(null, $ph->get('myfoo'), '->get() can have the same key for several namespaces');
 
 // ->getNames()
 $t->diag('->getNames()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('yourfoo', 'bar');
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
 
-$t->is($ph->getNames(), array('foo', 'yourfoo'), '->getNames() returns all key names for the default namespace');
-$t->is($ph->getNames('symfony/mynamespace'), array('myfoo'), '->getNames() takes a namepace as its first argument');
+$t->is($ph->getNames(), ['foo', 'yourfoo'], '->getNames() returns all key names for the default namespace');
+$t->is($ph->getNames('symfony/mynamespace'), ['myfoo'], '->getNames() takes a namepace as its first argument');
 
 // ->getNamespaces()
 $t->diag('->getNamespaces()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('yourfoo', 'bar');
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
 
-$t->is($ph->getNamespaces(), array($ph->getDefaultNamespace(), 'symfony/mynamespace'), '->getNamespaces() returns all non empty namespaces');
+$t->is($ph->getNamespaces(), [$ph->getDefaultNamespace(), 'symfony/mynamespace'], '->getNamespaces() returns all non empty namespaces');
 
 // ->setDefaultNamespace()
 $t->diag('->setDefaultNamespace()');
-$ph = new sfNamespacedParameterHolder('symfony/mynamespace');
+$ph = new \sfNamespacedParameterHolder('symfony/mynamespace');
 $ph->setDefaultNamespace('othernamespace');
 
 $t->is($ph->getDefaultNamespace(), 'othernamespace', '->setDefaultNamespace() sets the default namespace');
@@ -77,15 +78,15 @@
 
 // ->getAll()
 $t->diag('->getAll()');
-$parameters = array('foo' => 'bar', 'myfoo' => 'bar');
-$ph = new sfNamespacedParameterHolder();
+$parameters = ['foo' => 'bar', 'myfoo' => 'bar'];
+$ph = new \sfNamespacedParameterHolder();
 $ph->add($parameters);
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
 $t->is($ph->getAll(), $parameters, '->getAll() returns all parameters from the default namespace');
 
 // ->has()
 $t->diag('->has()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
 $t->is($ph->has('foo'), true, '->has() returns true if the key exists');
@@ -95,7 +96,7 @@
 
 // ->hasNamespace()
 $t->diag('->hasNamespace()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
 $t->is($ph->hasNamespace($ph->getDefaultNamespace()), true, '->hasNamespace() returns true for the default namespace');
@@ -104,7 +105,7 @@
 
 // ->remove()
 $t->diag('->remove()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('myfoo', 'bar');
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
@@ -125,7 +126,7 @@
 
 // ->removeNamespace()
 $t->diag('->removeNamespace()');
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('myfoo', 'bar');
 $ph->set('myfoo', 'bar', 'symfony/mynamespace');
@@ -153,7 +154,7 @@
 $t->diag('->set()');
 $foo = 'bar';
 
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->set('foo', $foo);
 $t->is($ph->get('foo'), $foo, '->set() sets the value for a key');
 
@@ -167,7 +168,7 @@
 $t->diag('->setByRef()');
 $foo = 'bar';
 
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->setByRef('foo', $foo);
 $t->is($ph->get('foo'), $foo, '->setByRef() sets the value for a key');
 
@@ -181,10 +182,10 @@
 // ->add()
 $t->diag('->add()');
 $foo = 'bar';
-$parameters = array('foo' => $foo, 'bar' => 'bar');
-$myparameters = array('myfoo' => 'bar', 'mybar' => 'bar');
+$parameters = ['foo' => $foo, 'bar' => 'bar'];
+$myparameters = ['myfoo' => 'bar', 'mybar' => 'bar'];
 
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->add($parameters);
 $ph->add($myparameters, 'symfony/mynamespace');
 
@@ -197,10 +198,10 @@
 // ->addByRef()
 $t->diag('->addByRef()');
 $foo = 'bar';
-$parameters = array('foo' => &$foo, 'bar' => 'bar');
-$myparameters = array('myfoo' => 'bar', 'mybar' => 'bar');
+$parameters = ['foo' => &$foo, 'bar' => 'bar'];
+$myparameters = ['myfoo' => 'bar', 'mybar' => 'bar'];
 
-$ph = new sfNamespacedParameterHolder();
+$ph = new \sfNamespacedParameterHolder();
 $ph->addByRef($parameters);
 $ph->addByRef($myparameters, 'symfony/mynamespace');
 
diff --git a/test/unit/util/sfParameterHolderTest.php b/test/unit/util/sfParameterHolderTest.php
index 872b26387..314f349ce 100644
--- a/test/unit/util/sfParameterHolderTest.php
+++ b/test/unit/util/sfParameterHolderTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(28);
+$t = new \lime_test(28);
 
 // ->clear()
 $t->diag('->clear()');
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->clear();
 $t->is($ph->getAll(), null, '->clear() clears all parameters');
 
@@ -24,7 +25,7 @@
 
 // ->get()
 $t->diag('->get()');
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->set('foo', 'bar');
 $t->is($ph->get('foo'), 'bar', '->get() returns the parameter value for the given key');
 $t->is($ph->get('bar'), null, '->get() returns null if the key does not exist');
@@ -45,27 +46,27 @@
 $t->is($ph->get('ref'), 'barfoo');
 $t->is($ref2, $ref1, '->get() returns a reference for the given key');
 
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $t->is('default_value', $ph->get('foo1', 'default_value'), '->get() takes the default value as its second argument');
 
 // ->getNames()
 $t->diag('->getNames()');
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('yourfoo', 'bar');
 
-$t->is($ph->getNames(), array('foo', 'yourfoo'), '->getNames() returns all key names');
+$t->is($ph->getNames(), ['foo', 'yourfoo'], '->getNames() returns all key names');
 
 // ->getAll()
 $t->diag('->getAll()');
-$parameters = array('foo' => 'bar', 'myfoo' => 'bar');
-$ph = new sfParameterHolder();
+$parameters = ['foo' => 'bar', 'myfoo' => 'bar'];
+$ph = new \sfParameterHolder();
 $ph->add($parameters);
 $t->is($ph->getAll(), $parameters, '->getAll() returns all parameters');
 
 // ->has()
 $t->diag('->has()');
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->set('foo', 'bar');
 $t->is($ph->has('foo'), true, '->has() returns true if the key exists');
 $t->is($ph->has('bar'), false, '->has() returns false if the key does not exist');
@@ -74,7 +75,7 @@
 
 // ->remove()
 $t->diag('->remove()');
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->set('foo', 'bar');
 $ph->set('myfoo', 'bar');
 
@@ -92,7 +93,7 @@
 $t->diag('->set()');
 $foo = 'bar';
 
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->set('foo', $foo);
 $t->is($ph->get('foo'), $foo, '->set() sets the value for a key');
 
@@ -103,7 +104,7 @@
 $t->diag('->setByRef()');
 $foo = 'bar';
 
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->setByRef('foo', $foo);
 $t->is($ph->get('foo'), $foo, '->setByRef() sets the value for a key');
 
@@ -113,10 +114,10 @@
 // ->add()
 $t->diag('->add()');
 $foo = 'bar';
-$parameters = array('foo' => $foo, 'bar' => 'bar');
-$myparameters = array('myfoo' => 'bar', 'mybar' => 'bar');
+$parameters = ['foo' => $foo, 'bar' => 'bar'];
+$myparameters = ['myfoo' => 'bar', 'mybar' => 'bar'];
 
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->add($parameters);
 
 $t->is($ph->getAll(), $parameters, '->add() adds an array of parameters');
@@ -127,10 +128,10 @@
 // ->addByRef()
 $t->diag('->addByRef()');
 $foo = 'bar';
-$parameters = array('foo' => &$foo, 'bar' => 'bar');
-$myparameters = array('myfoo' => 'bar', 'mybar' => 'bar');
+$parameters = ['foo' => &$foo, 'bar' => 'bar'];
+$myparameters = ['myfoo' => 'bar', 'mybar' => 'bar'];
 
-$ph = new sfParameterHolder();
+$ph = new \sfParameterHolder();
 $ph->addByRef($parameters);
 
 $t->is($parameters, $ph->getAll(), '->add() adds an array of parameters');
diff --git a/test/unit/util/sfToolkitTest.php b/test/unit/util/sfToolkitTest.php
index 6e9032131..6f808e74a 100644
--- a/test/unit/util/sfToolkitTest.php
+++ b/test/unit/util/sfToolkitTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,87 +11,87 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(96);
+$t = new \lime_test(96);
 
 // ::stringToArray()
 $t->diag('::stringToArray()');
-$tests = array(
-    'foo=bar' => array('foo' => 'bar'),
-    'foo1=bar1 foo=bar   ' => array('foo1' => 'bar1', 'foo' => 'bar'),
-    'foo1="bar1 foo1"' => array('foo1' => 'bar1 foo1'),
-    'foo1="bar1 foo1" foo=bar' => array('foo1' => 'bar1 foo1', 'foo' => 'bar'),
-    'foo1 = "bar1=foo1" foo=bar' => array('foo1' => 'bar1=foo1', 'foo' => 'bar'),
-    'foo1= \'bar1 foo1\'    foo  =     bar' => array('foo1' => 'bar1 foo1', 'foo' => 'bar'),
-    'foo1=\'bar1=foo1\' foo = bar' => array('foo1' => 'bar1=foo1', 'foo' => 'bar'),
-    'foo1=  bar1 foo1 foo=bar' => array('foo1' => 'bar1 foo1', 'foo' => 'bar'),
-    'foo1="l\'autre" foo=bar' => array('foo1' => 'l\'autre', 'foo' => 'bar'),
-    'foo1="l"autre" foo=bar' => array('foo1' => 'l"autre', 'foo' => 'bar'),
-    'foo_1=bar_1' => array('foo_1' => 'bar_1'),
-    'data-foo=bar' => array('data-foo' => 'bar'),
-    'data-foo-bar=baz' => array('data-foo-bar' => 'baz'),
-);
+$tests = [
+    'foo=bar' => ['foo' => 'bar'],
+    'foo1=bar1 foo=bar   ' => ['foo1' => 'bar1', 'foo' => 'bar'],
+    'foo1="bar1 foo1"' => ['foo1' => 'bar1 foo1'],
+    'foo1="bar1 foo1" foo=bar' => ['foo1' => 'bar1 foo1', 'foo' => 'bar'],
+    'foo1 = "bar1=foo1" foo=bar' => ['foo1' => 'bar1=foo1', 'foo' => 'bar'],
+    'foo1= \'bar1 foo1\'    foo  =     bar' => ['foo1' => 'bar1 foo1', 'foo' => 'bar'],
+    'foo1=\'bar1=foo1\' foo = bar' => ['foo1' => 'bar1=foo1', 'foo' => 'bar'],
+    'foo1=  bar1 foo1 foo=bar' => ['foo1' => 'bar1 foo1', 'foo' => 'bar'],
+    'foo1="l\'autre" foo=bar' => ['foo1' => 'l\'autre', 'foo' => 'bar'],
+    'foo1="l"autre" foo=bar' => ['foo1' => 'l"autre', 'foo' => 'bar'],
+    'foo_1=bar_1' => ['foo_1' => 'bar_1'],
+    'data-foo=bar' => ['data-foo' => 'bar'],
+    'data-foo-bar=baz' => ['data-foo-bar' => 'baz'],
+];
 
 foreach ($tests as $string => $attributes) {
-    $t->is(sfToolkit::stringToArray($string), $attributes, '->stringToArray()');
+    $t->is(\sfToolkit::stringToArray($string), $attributes, '->stringToArray()');
 }
 
-$t->is(sfToolkit::stringToArray(null), array(), '->stringToArray() can accept a null value');
+$t->is(\sfToolkit::stringToArray(null), [], '->stringToArray() can accept a null value');
 
 // ::isUTF8()
 $t->diag('::isUTF8()');
-$t->is(sfToolkit::isUTF8('été'), true, '::isUTF8() returns true if the parameter is an UTF-8 encoded string');
-$t->is(sfToolkit::isUTF8('AZERTYazerty1234-_'), true, '::isUTF8() returns true if the parameter is an UTF-8 encoded string');
-$t->is(sfToolkit::isUTF8('AZERTYazerty1234-_'.chr(254)), false, '::isUTF8() returns false if the parameter is not an UTF-8 encoded string');
+$t->is(\sfToolkit::isUTF8('été'), true, '::isUTF8() returns true if the parameter is an UTF-8 encoded string');
+$t->is(\sfToolkit::isUTF8('AZERTYazerty1234-_'), true, '::isUTF8() returns true if the parameter is an UTF-8 encoded string');
+$t->is(\sfToolkit::isUTF8('AZERTYazerty1234-_'.chr(254)), false, '::isUTF8() returns false if the parameter is not an UTF-8 encoded string');
 // check a very long string
 $string = str_repeat('Here is an UTF8 string avec du français.', 1000);
-$t->is(sfToolkit::isUTF8($string), true, '::isUTF8() can operate on very large strings');
+$t->is(\sfToolkit::isUTF8($string), true, '::isUTF8() can operate on very large strings');
 
 // ::literalize()
 $t->diag('::literalize()');
-foreach (array('true', 'on', '+', 'yes') as $param) {
-    $t->is(sfToolkit::literalize($param), true, sprintf('::literalize() returns true with "%s"', $param));
+foreach (['true', 'on', '+', 'yes'] as $param) {
+    $t->is(\sfToolkit::literalize($param), true, sprintf('::literalize() returns true with "%s"', $param));
     if (strtoupper($param) != $param) {
-        $t->is(sfToolkit::literalize(strtoupper($param)), true, sprintf('::literalize() returns true with "%s"', strtoupper($param)));
+        $t->is(\sfToolkit::literalize(strtoupper($param)), true, sprintf('::literalize() returns true with "%s"', strtoupper($param)));
     }
-    $t->is(sfToolkit::literalize(' '.$param.' '), true, sprintf('::literalize() returns true with "%s"', ' '.$param.' '));
+    $t->is(\sfToolkit::literalize(' '.$param.' '), true, sprintf('::literalize() returns true with "%s"', ' '.$param.' '));
 }
 
-foreach (array('false', 'off', '-', 'no') as $param) {
-    $t->is(sfToolkit::literalize($param), false, sprintf('::literalize() returns false with "%s"', $param));
+foreach (['false', 'off', '-', 'no'] as $param) {
+    $t->is(\sfToolkit::literalize($param), false, sprintf('::literalize() returns false with "%s"', $param));
     if (strtoupper($param) != $param) {
-        $t->is(sfToolkit::literalize(strtoupper($param)), false, sprintf('::literalize() returns false with "%s"', strtoupper($param)));
+        $t->is(\sfToolkit::literalize(strtoupper($param)), false, sprintf('::literalize() returns false with "%s"', strtoupper($param)));
     }
-    $t->is(sfToolkit::literalize(' '.$param.' '), false, sprintf('::literalize() returns false with "%s"', ' '.$param.' '));
+    $t->is(\sfToolkit::literalize(' '.$param.' '), false, sprintf('::literalize() returns false with "%s"', ' '.$param.' '));
 }
 
-foreach (array('null', '~', '') as $param) {
-    $t->is(sfToolkit::literalize($param), null, sprintf('::literalize() returns null with "%s"', $param));
+foreach (['null', '~', ''] as $param) {
+    $t->is(\sfToolkit::literalize($param), null, sprintf('::literalize() returns null with "%s"', $param));
     if (strtoupper($param) != $param) {
-        $t->is(sfToolkit::literalize(strtoupper($param)), null, sprintf('::literalize() returns null with "%s"', strtoupper($param)));
+        $t->is(\sfToolkit::literalize(strtoupper($param)), null, sprintf('::literalize() returns null with "%s"', strtoupper($param)));
     }
-    $t->is(sfToolkit::literalize(' '.$param.' '), null, sprintf('::literalize() returns null with "%s"', ' '.$param.' '));
+    $t->is(\sfToolkit::literalize(' '.$param.' '), null, sprintf('::literalize() returns null with "%s"', ' '.$param.' '));
 }
 
 // ::replaceConstants()
 $t->diag('::replaceConstants()');
-sfConfig::set('foo', 'bar');
-$t->is(sfToolkit::replaceConstants('my value with a %foo% constant'), 'my value with a bar constant', '::replaceConstantsCallback() replaces constants enclosed in %');
-$t->is(sfToolkit::replaceConstants('%Y/%m/%d %H:%M'), '%Y/%m/%d %H:%M', '::replaceConstantsCallback() does not replace unknown constants');
-sfConfig::set('bar', null);
-$t->is(sfToolkit::replaceConstants('my value with a %bar% constant'), 'my value with a  constant', '::replaceConstantsCallback() replaces constants enclosed in % even if value is null');
-$t->is(sfToolkit::replaceConstants('my value with a %foobar% constant'), 'my value with a %foobar% constant', '::replaceConstantsCallback() returns the original string if the constant is not defined');
-$t->is(sfToolkit::replaceConstants('my value with a %foo\'bar% constant'), 'my value with a %foo\'bar% constant', '::replaceConstantsCallback() returns the original string if the constant is not defined');
-$t->is(sfToolkit::replaceConstants('my value with a %foo"bar% constant'), 'my value with a %foo"bar% constant', '::replaceConstantsCallback() returns the original string if the constant is not defined');
+\sfConfig::set('foo', 'bar');
+$t->is(\sfToolkit::replaceConstants('my value with a %foo% constant'), 'my value with a bar constant', '::replaceConstantsCallback() replaces constants enclosed in %');
+$t->is(\sfToolkit::replaceConstants('%Y/%m/%d %H:%M'), '%Y/%m/%d %H:%M', '::replaceConstantsCallback() does not replace unknown constants');
+\sfConfig::set('bar', null);
+$t->is(\sfToolkit::replaceConstants('my value with a %bar% constant'), 'my value with a  constant', '::replaceConstantsCallback() replaces constants enclosed in % even if value is null');
+$t->is(\sfToolkit::replaceConstants('my value with a %foobar% constant'), 'my value with a %foobar% constant', '::replaceConstantsCallback() returns the original string if the constant is not defined');
+$t->is(\sfToolkit::replaceConstants('my value with a %foo\'bar% constant'), 'my value with a %foo\'bar% constant', '::replaceConstantsCallback() returns the original string if the constant is not defined');
+$t->is(\sfToolkit::replaceConstants('my value with a %foo"bar% constant'), 'my value with a %foo"bar% constant', '::replaceConstantsCallback() returns the original string if the constant is not defined');
 
 // ::isPathAbsolute()
 $t->diag('::isPathAbsolute()');
-$t->is(sfToolkit::isPathAbsolute('/test'), true, '::isPathAbsolute() returns true if path is absolute');
-$t->is(sfToolkit::isPathAbsolute('\\test'), true, '::isPathAbsolute() returns true if path is absolute');
-$t->is(sfToolkit::isPathAbsolute('C:\\test'), true, '::isPathAbsolute() returns true if path is absolute');
-$t->is(sfToolkit::isPathAbsolute('d:/test'), true, '::isPathAbsolute() returns true if path is absolute');
-$t->is(sfToolkit::isPathAbsolute('test'), false, '::isPathAbsolute() returns false if path is relative');
-$t->is(sfToolkit::isPathAbsolute('../test'), false, '::isPathAbsolute() returns false if path is relative');
-$t->is(sfToolkit::isPathAbsolute('..\\test'), false, '::isPathAbsolute() returns false if path is relative');
+$t->is(\sfToolkit::isPathAbsolute('/test'), true, '::isPathAbsolute() returns true if path is absolute');
+$t->is(\sfToolkit::isPathAbsolute('\\test'), true, '::isPathAbsolute() returns true if path is absolute');
+$t->is(\sfToolkit::isPathAbsolute('C:\\test'), true, '::isPathAbsolute() returns true if path is absolute');
+$t->is(\sfToolkit::isPathAbsolute('d:/test'), true, '::isPathAbsolute() returns true if path is absolute');
+$t->is(\sfToolkit::isPathAbsolute('test'), false, '::isPathAbsolute() returns false if path is relative');
+$t->is(\sfToolkit::isPathAbsolute('../test'), false, '::isPathAbsolute() returns false if path is relative');
+$t->is(\sfToolkit::isPathAbsolute('..\\test'), false, '::isPathAbsolute() returns false if path is relative');
 
 // ::stripComments()
 $t->diag('::stripComments()');
@@ -110,7 +111,7 @@
 
 $stripped_php = '<?php $i = 1; ';
 
-$t->is(preg_replace('/\s*(\r?\n)+/', ' ', sfToolkit::stripComments($php)), $stripped_php, '::stripComments() strip all comments from a php string');
+$t->is(preg_replace('/\s*(\r?\n)+/', ' ', \sfToolkit::stripComments($php)), $stripped_php, '::stripComments() strip all comments from a php string');
 
 $php = <<<'EOF'
 <?php
@@ -119,14 +120,14 @@
 
 EOF;
 
-$t->is(sfToolkit::stripComments($php), $php, '::stripComments() correctly handles comments within strings');
+$t->is(\sfToolkit::stripComments($php), $php, '::stripComments() correctly handles comments within strings');
 
 // ::stripslashesDeep()
 $t->diag('::stripslashesDeep()');
-$t->is(sfToolkit::stripslashesDeep('foo'), 'foo', '::stripslashesDeep() strip slashes on string');
-$t->is(sfToolkit::stripslashesDeep(addslashes("foo's bar")), "foo's bar", '::stripslashesDeep() strip slashes on array');
-$t->is(sfToolkit::stripslashesDeep(array(addslashes("foo's bar"), addslashes("foo's bar"))), array("foo's bar", "foo's bar"), '::stripslashesDeep() strip slashes on deep arrays');
-$t->is(sfToolkit::stripslashesDeep(array(array('foo' => addslashes("foo's bar")), addslashes("foo's bar"))), array(array('foo' => "foo's bar"), "foo's bar"), '::stripslashesDeep() strip slashes on deep arrays');
+$t->is(\sfToolkit::stripslashesDeep('foo'), 'foo', '::stripslashesDeep() strip slashes on string');
+$t->is(\sfToolkit::stripslashesDeep(addslashes("foo's bar")), "foo's bar", '::stripslashesDeep() strip slashes on array');
+$t->is(\sfToolkit::stripslashesDeep([addslashes("foo's bar"), addslashes("foo's bar")]), ["foo's bar", "foo's bar"], '::stripslashesDeep() strip slashes on deep arrays');
+$t->is(\sfToolkit::stripslashesDeep([['foo' => addslashes("foo's bar")], addslashes("foo's bar")]), [['foo' => "foo's bar"], "foo's bar"], '::stripslashesDeep() strip slashes on deep arrays');
 
 // ::clearDirectory()
 $t->diag('::clearDirectory()');
@@ -135,7 +136,7 @@
 file_put_contents($tmp_dir.DIRECTORY_SEPARATOR.'test', 'ok');
 mkdir($tmp_dir.DIRECTORY_SEPARATOR.'foo');
 file_put_contents($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar', 'ok');
-sfToolkit::clearDirectory($tmp_dir);
+\sfToolkit::clearDirectory($tmp_dir);
 $t->ok(!is_dir($tmp_dir.DIRECTORY_SEPARATOR.'foo'), '::clearDirectory() removes all directories from the directory parameter');
 $t->ok(!is_file($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar'), '::clearDirectory() removes all directories from the directory parameter');
 $t->ok(!is_file($tmp_dir.DIRECTORY_SEPARATOR.'test'), '::clearDirectory() removes all directories from the directory parameter');
@@ -150,96 +151,96 @@
 file_put_contents($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar', 'ok');
 file_put_contents($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'foo', 'ok');
 file_put_contents($tmp_dir.DIRECTORY_SEPARATOR.'bar'.DIRECTORY_SEPARATOR.'bar', 'ok');
-sfToolkit::clearGlob($tmp_dir.'/*/bar');
+\sfToolkit::clearGlob($tmp_dir.'/*/bar');
 $t->ok(!is_file($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar'), '::clearGlob() removes all files and directories matching the pattern parameter');
 $t->ok(!is_file($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar'), '::clearGlob() removes all files and directories matching the pattern parameter');
 $t->ok(is_file($tmp_dir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'foo'), '::clearGlob() removes all files and directories matching the pattern parameter');
-sfToolkit::clearDirectory($tmp_dir);
+\sfToolkit::clearDirectory($tmp_dir);
 rmdir($tmp_dir);
 
 // ::arrayDeepMerge()
 $t->diag('::arrayDeepMerge()');
 $t->is(
-    sfToolkit::arrayDeepMerge(array('d' => 'due', 't' => 'tre'), array('d' => 'bis', 'q' => 'quattro')),
-    array('d' => 'bis', 't' => 'tre', 'q' => 'quattro'),
+    \sfToolkit::arrayDeepMerge(['d' => 'due', 't' => 'tre'], ['d' => 'bis', 'q' => 'quattro']),
+    ['d' => 'bis', 't' => 'tre', 'q' => 'quattro'],
     '::arrayDeepMerge() merges linear arrays preserving literal keys'
 );
 $t->is(
-    sfToolkit::arrayDeepMerge(array('d' => 'due', 't' => 'tre', 'c' => array('c' => 'cinco')), array('d' => array('due', 'bis'), 'q' => 'quattro', 'c' => array('c' => 'cinque', 'c2' => 'cinco'))),
-    array('d' => array('due', 'bis'), 't' => 'tre', 'q' => 'quattro', 'c' => array('c' => 'cinque', 'c2' => 'cinco')),
+    \sfToolkit::arrayDeepMerge(['d' => 'due', 't' => 'tre', 'c' => ['c' => 'cinco']], ['d' => ['due', 'bis'], 'q' => 'quattro', 'c' => ['c' => 'cinque', 'c2' => 'cinco']]),
+    ['d' => ['due', 'bis'], 't' => 'tre', 'q' => 'quattro', 'c' => ['c' => 'cinque', 'c2' => 'cinco']],
     '::arrayDeepMerge() recursively merges arrays preserving literal keys'
 );
 $t->is(
-    sfToolkit::arrayDeepMerge(array(2 => 'due', 3 => 'tre'), array(2 => 'bis', 4 => 'quattro')),
-    array(2 => 'bis', 3 => 'tre', 4 => 'quattro'),
+    \sfToolkit::arrayDeepMerge([2 => 'due', 3 => 'tre'], [2 => 'bis', 4 => 'quattro']),
+    [2 => 'bis', 3 => 'tre', 4 => 'quattro'],
     '::arrayDeepMerge() merges linear arrays preserving numerical keys'
 );
 $t->is(
-    sfToolkit::arrayDeepMerge(array(2 => array('due'), 3 => 'tre'), array(2 => array('bis', 'bes'), 4 => 'quattro')),
-    array(2 => array('bis', 'bes'), 3 => 'tre', 4 => 'quattro'),
+    \sfToolkit::arrayDeepMerge([2 => ['due'], 3 => 'tre'], [2 => ['bis', 'bes'], 4 => 'quattro']),
+    [2 => ['bis', 'bes'], 3 => 'tre', 4 => 'quattro'],
     '::arrayDeepMerge() recursively merges arrays preserving numerical keys'
 );
 
-$arr = array(
+$arr = [
     'foobar' => 'foo',
-    'foo' => array(
-        'bar' => array(
+    'foo' => [
+        'bar' => [
             'baz' => 'foo bar',
-        ),
-    ),
-    'bar' => array(
+        ],
+    ],
+    'bar' => [
         'foo',
         'bar',
-    ),
+    ],
     'simple' => 'string',
-);
+];
 
 // ::getArrayValueForPath()
 $t->diag('::getArrayValueForPath()');
 
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foobar'), 'foo', '::getArrayValueForPath() returns the value of the path if it exists');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'barfoo'), null, '::getArrayValueForPath() returns null if the path does not exist');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'barfoo', 'bar'), 'bar', '::getArrayValueForPath() takes a default value as its third argument');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foobar'), 'foo', '::getArrayValueForPath() returns the value of the path if it exists');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'barfoo'), null, '::getArrayValueForPath() returns null if the path does not exist');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'barfoo', 'bar'), 'bar', '::getArrayValueForPath() takes a default value as its third argument');
 
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][baz]'), 'foo bar', '::getArrayValueForPath() works with deep paths');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][bar]'), false, '::getArrayValueForPath() works with deep paths');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][bar]', 'bar'), 'bar', '::getArrayValueForPath() works with deep paths');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foo[bar][baz]'), 'foo bar', '::getArrayValueForPath() works with deep paths');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foo[bar][bar]'), false, '::getArrayValueForPath() works with deep paths');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foo[bar][bar]', 'bar'), 'bar', '::getArrayValueForPath() works with deep paths');
 
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[]'), array('bar' => array('baz' => 'foo bar')), '::getArrayValueForPath() accepts a [] at the end to check for an array');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foobar[]'), null, '::getArrayValueForPath() accepts a [] at the end to check for an array');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'barfoo[]'), null, '::getArrayValueForPath() accepts a [] at the end to check for an array');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foobar[]', 'foo'), 'foo', '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foo[]'), ['bar' => ['baz' => 'foo bar']], '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foobar[]'), null, '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'barfoo[]'), null, '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foobar[]', 'foo'), 'foo', '::getArrayValueForPath() accepts a [] at the end to check for an array');
 
-$t->is(sfToolkit::getArrayValueForPath($arr, 'bar[1]'), 'bar', '::getArrayValueForPath() can take an array indexed by integer');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'bar[2]'), null, '::getArrayValueForPath() can take an array indexed by integer');
-$t->is(sfToolkit::getArrayValueForPath($arr, 'bar[2]', 'foo'), 'foo', '::getArrayValueForPath() can take an array indexed by integer');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'bar[1]'), 'bar', '::getArrayValueForPath() can take an array indexed by integer');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'bar[2]'), null, '::getArrayValueForPath() can take an array indexed by integer');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'bar[2]', 'foo'), 'foo', '::getArrayValueForPath() can take an array indexed by integer');
 
-$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][baz][booze]'), null, '::getArrayValueForPath() is not fooled by php mistaking strings and array');
+$t->is(\sfToolkit::getArrayValueForPath($arr, 'foo[bar][baz][booze]'), null, '::getArrayValueForPath() is not fooled by php mistaking strings and array');
 
 // ::addIncludePath()
 $t->diag('::addIncludePath()');
 $path = get_include_path();
-$t->is(sfToolkit::addIncludePath(__DIR__), $path, '::addIncludePath() returns the previous include_path');
+$t->is(\sfToolkit::addIncludePath(__DIR__), $path, '::addIncludePath() returns the previous include_path');
 $t->is(get_include_path(), __DIR__.PATH_SEPARATOR.$path, '::addIncludePath() adds a path to the front of include_path');
 
-sfToolkit::addIncludePath(__DIR__, 'back');
+\sfToolkit::addIncludePath(__DIR__, 'back');
 $t->is(get_include_path(), $path.PATH_SEPARATOR.__DIR__, '::addIncludePath() moves a path to the end of include_path');
 
-sfToolkit::addIncludePath(array(
+\sfToolkit::addIncludePath([
     __DIR__,
     __DIR__.'/..',
-));
+]);
 $t->is(get_include_path(), __DIR__.PATH_SEPARATOR.__DIR__.'/..'.PATH_SEPARATOR.$path, '::addIncludePath() adds multiple paths the the front of include_path');
 
-sfToolkit::addIncludePath(array(
+\sfToolkit::addIncludePath([
     __DIR__,
     __DIR__.'/..',
-), 'back');
+], 'back');
 $t->is(get_include_path(), $path.PATH_SEPARATOR.__DIR__.PATH_SEPARATOR.__DIR__.'/..', '::addIncludePath() adds multiple paths the the back of include_path');
 
 try {
-    sfToolkit::addIncludePath(__DIR__, 'foobar');
+    \sfToolkit::addIncludePath(__DIR__, 'foobar');
     $t->fail('::addIncludePath() throws an exception if position is not valid');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('::addIncludePath() throws an exception if position is not valid');
 }
diff --git a/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php b/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
index 8fed7a0d5..d22862813 100644
--- a/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
+++ b/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,22 +11,22 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
 // ->configure()
 $t->diag('->configure()');
 
 try {
-    new sfValidatorI18nChoiceCountry(array('countries' => array('EN')));
+    new \sfValidatorI18nChoiceCountry(['countries' => ['EN']]);
     $t->fail('->configure() throws an InvalidArgumentException if a country does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->configure() throws an InvalidArgumentException if a country does not exist');
 }
 
-$v = new sfValidatorI18nChoiceCountry(array('countries' => array('FR', 'GB')));
-$t->is($v->getOption('choices'), array('FR', 'GB'), '->configure() can restrict the number of countries with the countries option');
+$v = new \sfValidatorI18nChoiceCountry(['countries' => ['FR', 'GB']]);
+$t->is($v->getOption('choices'), ['FR', 'GB'], '->configure() can restrict the number of countries with the countries option');
 
 // ->clean()
 $t->diag('->clean()');
-$v = new sfValidatorI18nChoiceCountry(array('countries' => array('FR', 'GB')));
+$v = new \sfValidatorI18nChoiceCountry(['countries' => ['FR', 'GB']]);
 $t->is($v->clean('FR'), 'FR', '->clean() cleans the input value');
diff --git a/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php b/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
index 202bb71a4..ae645663b 100644
--- a/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
+++ b/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,22 +11,22 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
 // ->configure()
 $t->diag('->configure()');
 
 try {
-    new sfValidatorI18nChoiceLanguage(array('languages' => array('xx')));
+    new \sfValidatorI18nChoiceLanguage(['languages' => ['xx']]);
     $t->fail('->configure() throws an InvalidArgumentException if a language does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->configure() throws an InvalidArgumentException if a language does not exist');
 }
 
-$v = new sfValidatorI18nChoiceLanguage(array('languages' => array('fr', 'en')));
-$t->is($v->getOption('choices'), array('fr', 'en'), '->configure() can restrict the number of languages with the languages option');
+$v = new \sfValidatorI18nChoiceLanguage(['languages' => ['fr', 'en']]);
+$t->is($v->getOption('choices'), ['fr', 'en'], '->configure() can restrict the number of languages with the languages option');
 
 // ->clean()
 $t->diag('->clean()');
-$v = new sfValidatorI18nChoiceLanguage(array('languages' => array('fr', 'en')));
+$v = new \sfValidatorI18nChoiceLanguage(['languages' => ['fr', 'en']]);
 $t->is($v->clean('fr'), 'fr', '->clean() cleans the input value');
diff --git a/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php b/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
index 8d6f10e30..cb551d6ef 100644
--- a/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
+++ b/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
 // ->configure()
 $t->diag('->configure()');
 
 // ->clean()
 $t->diag('->clean()');
-$v = new sfValidatorI18nChoiceTimezone();
+$v = new \sfValidatorI18nChoiceTimezone();
 $t->is($v->clean('Europe/Paris'), 'Europe/Paris', '->clean() cleans the input value');
diff --git a/test/unit/validator/sfValidatorAndTest.php b/test/unit/validator/sfValidatorAndTest.php
index ae0d5dee5..c6f9ac9fd 100644
--- a/test/unit/validator/sfValidatorAndTest.php
+++ b/test/unit/validator/sfValidatorAndTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,35 +11,35 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(25);
+$t = new \lime_test(25);
 
-$v1 = new sfValidatorString(array('max_length' => 3));
-$v2 = new sfValidatorString(array('min_length' => 3));
+$v1 = new \sfValidatorString(['max_length' => 3]);
+$v2 = new \sfValidatorString(['min_length' => 3]);
 
-$v = new sfValidatorAnd(array($v1, $v2));
+$v = new \sfValidatorAnd([$v1, $v2]);
 
 // __construct()
 $t->diag('__construct()');
-$v = new sfValidatorAnd();
-$t->is($v->getValidators(), array(), '->__construct() can take no argument');
-$v = new sfValidatorAnd($v1);
-$t->is($v->getValidators(), array($v1), '->__construct() can take a validator as its first argument');
-$v = new sfValidatorAnd(array($v1, $v2));
-$t->is($v->getValidators(), array($v1, $v2), '->__construct() can take an array of validators as its first argument');
+$v = new \sfValidatorAnd();
+$t->is($v->getValidators(), [], '->__construct() can take no argument');
+$v = new \sfValidatorAnd($v1);
+$t->is($v->getValidators(), [$v1], '->__construct() can take a validator as its first argument');
+$v = new \sfValidatorAnd([$v1, $v2]);
+$t->is($v->getValidators(), [$v1, $v2], '->__construct() can take an array of validators as its first argument');
 
 try {
-    $v = new sfValidatorAnd('string');
+    $v = new \sfValidatorAnd('string');
     $t->fail('__construct() throws an exception when passing a non supported first argument');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an exception when passing a non supported first argument');
 }
 
 // ->addValidator()
 $t->diag('->addValidator()');
-$v = new sfValidatorAnd();
+$v = new \sfValidatorAnd();
 $v->addValidator($v1);
 $v->addValidator($v2);
-$t->is($v->getValidators(), array($v1, $v2), '->addValidator() adds a validator');
+$t->is($v->getValidators(), [$v1, $v2], '->addValidator() adds a validator');
 
 // ->clean()
 $t->diag('->clean()');
@@ -49,7 +50,7 @@
     $v->clean(null);
     $t->fail('->clean() throws an sfValidatorError exception if the input value is required');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if the input value is required');
     $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
 }
@@ -60,10 +61,10 @@
     $v->clean('foo');
     $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->skip('', 2);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->is($e[0]->getCode(), 'max_length', '->clean() throws a sfValidatorSchemaError');
-    $t->ok($e instanceof sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
+    $t->ok($e instanceof \sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
 }
 
 $v1->setOption('max_length', 2);
@@ -72,12 +73,12 @@
     $v->clean('foo');
     $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->skip('', 4);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->is(count($e), 2, '->clean() throws an error for every error');
     $t->is($e[0]->getCode(), 'max_length', '->clean() throws a sfValidatorSchemaError');
     $t->is($e[1]->getCode(), 'max_length', '->clean() throws a sfValidatorSchemaError');
-    $t->ok($e instanceof sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
+    $t->ok($e instanceof \sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
 }
 
 $v->setOption('halt_on_error', true);
@@ -86,11 +87,11 @@
     $v->clean('foo');
     $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->skip('', 3);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->is(count($e), 1, '->clean() only returns the first error if halt_on_error option is true');
     $t->is($e[0]->getCode(), 'max_length', '->clean() throws a sfValidatorSchemaError');
-    $t->ok($e instanceof sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
+    $t->ok($e instanceof \sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
 }
 
 try {
@@ -98,18 +99,18 @@
     $v->clean('foo');
     $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->skip('', 2);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError if invalid message is not empty');
-    $t->ok(!$e instanceof sfValidatorErrorSchema, '->clean() throws a sfValidatorError if invalid message is not empty');
+    $t->ok(!$e instanceof \sfValidatorErrorSchema, '->clean() throws a sfValidatorError if invalid message is not empty');
 }
 
 // ->asString()
 $t->diag('->asString()');
-$v1 = new sfValidatorString(array('max_length' => 3));
-$v2 = new sfValidatorString(array('min_length' => 3));
-$v = new sfValidatorAnd(array($v1, $v2));
+$v1 = new \sfValidatorString(['max_length' => 3]);
+$v2 = new \sfValidatorString(['min_length' => 3]);
+$v = new \sfValidatorAnd([$v1, $v2]);
 $t->is($v->asString(), "(\n  String({ max_length: 3 })\n  and\n  String({ min_length: 3 })\n)", '->asString() returns a string representation of the validator');
 
-$v = new sfValidatorAnd(array($v1, $v2), array(), array('required' => 'This is required.'));
+$v = new \sfValidatorAnd([$v1, $v2], [], ['required' => 'This is required.']);
 $t->is($v->asString(), "(\n  String({ max_length: 3 })\n  and({}, { required: 'This is required.' })\n  String({ min_length: 3 })\n)", '->asString() returns a string representation of the validator');
diff --git a/test/unit/validator/sfValidatorBaseTest.php b/test/unit/validator/sfValidatorBaseTest.php
index 012779336..2230c1574 100644
--- a/test/unit/validator/sfValidatorBaseTest.php
+++ b/test/unit/validator/sfValidatorBaseTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,16 +11,16 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(47);
+$t = new \lime_test(47);
 
-class ValidatorIdentity extends sfValidatorBase
+class ValidatorIdentity extends \sfValidatorBase
 {
     public function testIsEmpty($value)
     {
         return $this->isEmpty($value);
     }
 
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addOption('foo', 'bar');
         $this->addMessage('foo', 'bar');
@@ -31,9 +32,9 @@ protected function doClean($value)
     }
 }
 
-class ValidatorIdentityWithRequired extends sfValidatorBase
+class ValidatorIdentityWithRequired extends \sfValidatorBase
 {
-    protected function configure($options = array(), $messages = array())
+    protected function configure($options = [], $messages = [])
     {
         $this->addRequiredOption('foo');
     }
@@ -46,46 +47,46 @@ protected function doClean($value)
 
 // ->configure()
 $t->diag('->configure()');
-$v = new ValidatorIdentity();
+$v = new \ValidatorIdentity();
 $t->is($v->getOption('foo'), 'bar', '->configure() can add some options');
-$v = new ValidatorIdentity(array('foo' => 'foobar'));
+$v = new \ValidatorIdentity(['foo' => 'foobar']);
 $t->is($v->getOption('foo'), 'foobar', '->configure() takes an options array as its first argument and values override default option values');
-$v = new ValidatorIdentity();
+$v = new \ValidatorIdentity();
 $t->is($v->getMessage('foo'), 'bar', '->configure() can add some message');
-$v = new ValidatorIdentity(array(), array('foo' => 'foobar'));
+$v = new \ValidatorIdentity([], ['foo' => 'foobar']);
 $t->is($v->getMessage('foo'), 'foobar', '->configure() takes a messages array as its second argument and values override default message values');
 
 try {
-    new ValidatorIdentity(array('nonexistant' => false, 'foo' => 'foobar', 'anothernonexistant' => 'bar', 'required' => true));
+    new \ValidatorIdentity(['nonexistant' => false, 'foo' => 'foobar', 'anothernonexistant' => 'bar', 'required' => true]);
     $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant options');
     $t->skip();
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException if you pass some non existant options');
     $t->like($e->getMessage(), '/ \'nonexistant\', \'anothernonexistant\'/', 'The exception contains the non existant option names');
 }
 
 try {
-    new ValidatorIdentity(array(), array('required' => 'This is required.', 'nonexistant' => 'foo', 'anothernonexistant' => false));
+    new \ValidatorIdentity([], ['required' => 'This is required.', 'nonexistant' => 'foo', 'anothernonexistant' => false]);
     $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant error codes');
     $t->skip();
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException if you pass some non existant error codes');
     $t->like($e->getMessage(), '/ \'nonexistant\', \'anothernonexistant\'/', 'The exception contains the non existant error codes');
 }
 
 // ->getRequiredOptions()
 $t->diag('getRequiredOptions');
-$v = new ValidatorIdentityWithRequired(array('foo' => 'bar'));
-$t->is($v->getRequiredOptions(), array('foo'), '->getRequiredOptions() returns an array of required option names');
+$v = new \ValidatorIdentityWithRequired(['foo' => 'bar']);
+$t->is($v->getRequiredOptions(), ['foo'], '->getRequiredOptions() returns an array of required option names');
 
 try {
-    new ValidatorIdentityWithRequired();
+    new \ValidatorIdentityWithRequired();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a required option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a required option');
 }
 
-$v = new ValidatorIdentity();
+$v = new \ValidatorIdentity();
 
 // ->clean()
 $t->diag('->clean()');
@@ -95,7 +96,7 @@ protected function doClean($value)
     $t->is($v->clean(''), '');
     $t->fail('->clean() throws a sfValidatorError exception if the data does not validate');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError exception if the data does not validate');
     $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
 }
@@ -105,7 +106,7 @@ protected function doClean($value)
 $t->diag('->isEmpty()');
 $t->is($v->testIsEmpty(null), true, 'null value isEmpty()');
 $t->is($v->testIsEmpty(''), true, 'empty string value isEmpty()');
-$t->is($v->testIsEmpty(array()), true, 'empty array value isEmpty()');
+$t->is($v->testIsEmpty([]), true, 'empty array value isEmpty()');
 $t->is($v->testIsEmpty(false), false, 'false value not isEmpty()');
 
 // ->getEmptyValue()
@@ -125,7 +126,7 @@ protected function doClean($value)
 try {
     $v->setOption('foobar', 'foo');
     $t->fail('->setOption() throws an InvalidArgumentException if the option is not registered');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setOption() throws an InvalidArgumentException if the option is not registered');
 }
 
@@ -147,12 +148,12 @@ protected function doClean($value)
 
 // ->getOptions() ->setOptions()
 $t->diag('->getOptions() ->setOptions()');
-$v->setOptions(array('required' => true, 'trim' => false));
-$t->is($v->getOptions(), array('required' => true, 'trim' => false, 'empty_value' => null), '->setOptions() changes all options');
+$v->setOptions(['required' => true, 'trim' => false]);
+$t->is($v->getOptions(), ['required' => true, 'trim' => false, 'empty_value' => null], '->setOptions() changes all options');
 
 // ->getMessages()
 $t->diag('->getMessages()');
-$t->is($v->getMessages(), array('required' => 'Required.', 'invalid' => 'Invalid.', 'foo' => 'bar'), '->getMessages() returns an array of all error messages');
+$t->is($v->getMessages(), ['required' => 'Required.', 'invalid' => 'Invalid.', 'foo' => 'bar'], '->getMessages() returns an array of all error messages');
 
 // ->getMessage()
 $t->diag('->getMessage()');
@@ -166,21 +167,21 @@ protected function doClean($value)
 try {
     $v->clean('');
     $t->isnt($e->getMessage(), 'The field is required.', '->setMessage() changes the default error message string');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'The field is required.', '->setMessage() changes the default error message string');
 }
 
 try {
     $v->setMessage('foobar', 'foo');
     $t->fail('->setMessage() throws an InvalidArgumentException if the message is not registered');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setMessage() throws an InvalidArgumentException if the message is not registered');
 }
 
 // ->setMessages()
 $t->diag('->setMessages()');
-$v->setMessages(array('required' => 'This is required!'));
-$t->is($v->getMessages(), array('invalid' => 'Invalid.', 'required' => 'This is required!'), '->setMessages() changes all error messages');
+$v->setMessages(['required' => 'This is required!']);
+$t->is($v->getMessages(), ['invalid' => 'Invalid.', 'required' => 'This is required!'], '->setMessages() changes all error messages');
 
 // ->addMessage()
 $t->diag('->addMessage()');
@@ -190,17 +191,17 @@ protected function doClean($value)
 
 // ->getErrorCodes()
 $t->diag('->getErrorCodes()');
-$t->is($v->getErrorCodes(), array('required', 'invalid', 'foo'), '->getErrorCodes() returns an array of error codes the validator can use');
+$t->is($v->getErrorCodes(), ['required', 'invalid', 'foo'], '->getErrorCodes() returns an array of error codes the validator can use');
 
 // ::getCharset() ::setCharset()
 $t->diag('::getCharset() ::setCharset()');
-$t->is(sfValidatorBase::getCharset(), 'UTF-8', '::getCharset() returns the charset to use for validators');
-sfValidatorBase::setCharset('ISO-8859-1');
-$t->is(sfValidatorBase::getCharset(), 'ISO-8859-1', '::setCharset() changes the charset to use for validators');
+$t->is(\sfValidatorBase::getCharset(), 'UTF-8', '::getCharset() returns the charset to use for validators');
+\sfValidatorBase::setCharset('ISO-8859-1');
+$t->is(\sfValidatorBase::getCharset(), 'ISO-8859-1', '::setCharset() changes the charset to use for validators');
 
 // ->asString()
 $t->diag('->asString()');
-$v = new ValidatorIdentity();
+$v = new \ValidatorIdentity();
 $t->is($v->asString(), 'ValidatorIdentity()', '->asString() returns a string representation of the validator');
 $v->setOption('required', false);
 $v->setOption('foo', 'foo');
@@ -209,20 +210,20 @@ protected function doClean($value)
 $v->setMessage('required', 'This is required.');
 $t->is($v->asString(), 'ValidatorIdentity({ required: false, foo: foo }, { required: \'This is required.\' })', '->asString() returns a string representation of the validator');
 
-$v = new ValidatorIdentity();
+$v = new \ValidatorIdentity();
 $v->setMessage('required', 'This is required.');
 $t->is($v->asString(), 'ValidatorIdentity({}, { required: \'This is required.\' })', '->asString() returns a string representation of the validator');
 
 // ::setDefaultMessage()
 $t->diag('::setDefaultMessage()');
-ValidatorIdentity::setDefaultMessage('required', 'This field is required.');
-ValidatorIdentity::setDefaultMessage('invalid', 'This field is invalid.');
-ValidatorIdentity::setDefaultMessage('foo', 'Foo bar.');
-$v = new ValidatorIdentity();
+\ValidatorIdentity::setDefaultMessage('required', 'This field is required.');
+\ValidatorIdentity::setDefaultMessage('invalid', 'This field is invalid.');
+\ValidatorIdentity::setDefaultMessage('foo', 'Foo bar.');
+$v = new \ValidatorIdentity();
 $t->is($v->getMessage('required'), 'This field is required.', '::setDefaultMessage() sets the default message for an error');
 $t->is($v->getMessage('invalid'), 'This field is invalid.', '::setDefaultMessage() sets the default message for an error');
 $t->is($v->getMessage('foo'), 'Foo bar.', '::setDefaultMessage() sets the default message for an error');
 
-$v = new ValidatorIdentity(array(), array('required' => 'Yep, this is required!', 'foo' => 'Yep, this is a foo error!'));
+$v = new \ValidatorIdentity([], ['required' => 'Yep, this is required!', 'foo' => 'Yep, this is a foo error!']);
 $t->is($v->getMessage('required'), 'Yep, this is required!', '::setDefaultMessage() is ignored if the validator explicitly overrides the message');
 $t->is($v->getMessage('foo'), 'Yep, this is a foo error!', '::setDefaultMessage() is ignored if the validator explicitly overrides the message');
diff --git a/test/unit/validator/sfValidatorBooleanTest.php b/test/unit/validator/sfValidatorBooleanTest.php
index 80405d33d..9124b230b 100755
--- a/test/unit/validator/sfValidatorBooleanTest.php
+++ b/test/unit/validator/sfValidatorBooleanTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(23);
+$t = new \lime_test(23);
 
-$v = new sfValidatorBoolean();
+$v = new \sfValidatorBoolean();
 
 // ->clean()
 $t->diag('->clean()');
@@ -43,7 +44,7 @@ public function __toString()
         return 'false';
     }
 }
-$t->is($v->clean(new MyFalseClass()), false, '->clean() returns false if the value is false');
+$t->is($v->clean(new \MyFalseClass()), false, '->clean() returns false if the value is false');
 
 // required is false by default
 $t->is($v->clean(null), false, '->clean() returns false if the value is null');
@@ -52,7 +53,7 @@ public function __toString()
     $v->clean('astring');
     $t->fail('->clean() throws an error if the input value is not a true or a false value');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an error if the input value is not a true or a false value');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
diff --git a/test/unit/validator/sfValidatorCSRFTokenTest.php b/test/unit/validator/sfValidatorCSRFTokenTest.php
index 877225a9c..4e62177fa 100644
--- a/test/unit/validator/sfValidatorCSRFTokenTest.php
+++ b/test/unit/validator/sfValidatorCSRFTokenTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,19 +11,19 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(5);
+$t = new \lime_test(5);
 
 // __construct()
 $t->diag('__construct()');
 
 try {
-    new sfValidatorCSRFToken();
+    new \sfValidatorCSRFToken();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a token option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a token option');
 }
 
-$v = new sfValidatorCSRFToken(array('token' => 'symfony'));
+$v = new \sfValidatorCSRFToken(['token' => 'symfony']);
 
 // ->clean()
 $t->diag('->clean()');
@@ -32,7 +33,7 @@
     $v->clean('another');
     $t->fail('->clean() throws an sfValidatorError if the token is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the token is not valid');
     $t->is($e->getCode(), 'csrf_attack', '->clean() throws a sfValidatorError');
 }
diff --git a/test/unit/validator/sfValidatorCallbackTest.php b/test/unit/validator/sfValidatorCallbackTest.php
index fae548b43..ad38021e7 100644
--- a/test/unit/validator/sfValidatorCallbackTest.php
+++ b/test/unit/validator/sfValidatorCallbackTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
 function clean_test($validator, $value, $arguments)
 {
     if ('foo' != $value) {
-        throw new sfValidatorError($validator, 'must_be_foo');
+        throw new \sfValidatorError($validator, 'must_be_foo');
     }
 
     return "*{$value}*".implode('-', $arguments);
@@ -25,13 +26,13 @@ function clean_test($validator, $value, $arguments)
 $t->diag('__construct()');
 
 try {
-    new sfValidatorCallback();
+    new \sfValidatorCallback();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a callback option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a callback option');
 }
 
-$v = new sfValidatorCallback(array('callback' => 'clean_test'));
+$v = new \sfValidatorCallback(['callback' => 'clean_test']);
 
 // ->configure()
 $t->diag('->configure()');
@@ -45,16 +46,16 @@ function clean_test($validator, $value, $arguments)
     $v->clean('bar');
     $t->fail('->clean() throws a sfValidatorError');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError');
     $t->is($e->getCode(), 'must_be_foo', '->clean() throws a sfValidatorError');
 }
 
 $t->diag('callback with arguments');
-$v = new sfValidatorCallback(array('callback' => 'clean_test', 'arguments' => array('fabien', 'symfony')));
+$v = new \sfValidatorCallback(['callback' => 'clean_test', 'arguments' => ['fabien', 'symfony']]);
 $t->is($v->clean('foo'), '*foo*fabien-symfony', '->configure() can take an arguments option');
 
 // ->asString()
 $t->diag('->asString()');
-$v = new sfValidatorCallback(array('callback' => 'clean_test'));
+$v = new \sfValidatorCallback(['callback' => 'clean_test']);
 $t->is($v->asString(), 'Callback({ callback: clean_test })', '->asString() returns a string representation of the validator');
diff --git a/test/unit/validator/sfValidatorChoiceTest.php b/test/unit/validator/sfValidatorChoiceTest.php
index 2569597ee..ef02ac6b8 100644
--- a/test/unit/validator/sfValidatorChoiceTest.php
+++ b/test/unit/validator/sfValidatorChoiceTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,14 +11,14 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(14);
+$t = new \lime_test(14);
 
 function choice_callable()
 {
-    return array(1, 2, 3);
+    return [1, 2, 3];
 }
 
-class ValidatorChoiceTestIsEmpty extends sfValidatorChoice
+class ValidatorChoiceTestIsEmpty extends \sfValidatorChoice
 {
     public function run($value)
     {
@@ -29,19 +30,19 @@ public function run($value)
 $t->diag('__construct()');
 
 try {
-    new sfValidatorChoice();
+    new \sfValidatorChoice();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass an expected option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass an expected option');
 }
 
-$v = new ValidatorChoiceTestIsEmpty(array('choices' => array('foo', 'bar')));
+$v = new \ValidatorChoiceTestIsEmpty(['choices' => ['foo', 'bar']]);
 
 // ->isEmpty()
 $t->diag('->isEmpty()');
-$t->is($v->run(array('', '')), true, '->isEmpty() return true if array has only empty value(s)');
+$t->is($v->run(['', '']), true, '->isEmpty() return true if array has only empty value(s)');
 
-$v = new sfValidatorChoice(array('choices' => array('foo', 'bar')));
+$v = new \sfValidatorChoice(['choices' => ['foo', 'bar']]);
 
 // ->clean()
 $t->diag('->clean()');
@@ -52,7 +53,7 @@ public function run($value)
     $v->clean('foobar');
     $t->fail('->clean() throws an sfValidatorError if the value is not an expected value');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the value is not an expected value');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -63,38 +64,38 @@ public function run($value)
 
 // choices as a callable
 $t->diag('choices as a callable');
-$v = new sfValidatorChoice(array('choices' => new sfCallable('choice_callable')));
+$v = new \sfValidatorChoice(['choices' => new \sfCallable('choice_callable')]);
 $t->is($v->clean('2'), '2', '__construct() can take a sfCallable object as a choices option');
 
 // see bug #4212
-$v = new sfValidatorChoice(array('choices' => array(0, 1, 2)));
+$v = new \sfValidatorChoice(['choices' => [0, 1, 2]]);
 
 try {
     $v->clean('xxx');
     $t->fail('->clean() throws an sfValidatorError if the value is not strictly an expected value');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the value is not strictly an expected value');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 // min/max options
-$v = new sfValidatorChoice(array('multiple' => true, 'choices' => array(0, 1, 2, 3, 4, 5), 'min' => 2, 'max' => 3));
+$v = new \sfValidatorChoice(['multiple' => true, 'choices' => [0, 1, 2, 3, 4, 5], 'min' => 2, 'max' => 3]);
 
 try {
-    $v->clean(array(0));
+    $v->clean([0]);
     $t->fail('->clean() throws an sfValidatorError if the minimum number of values are not selected');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the minimum number of values are not selected');
     $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
 }
 
 try {
-    $v->clean(array(0, 1, 2, 3));
+    $v->clean([0, 1, 2, 3]);
     $t->fail('->clean() throws an sfValidatorError if more than the maximum number of values are selected');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if more than the maximum number of values are selected');
     $t->is($e->getCode(), 'max', '->clean() throws a sfValidatorError');
 }
diff --git a/test/unit/validator/sfValidatorDateRangeTest.php b/test/unit/validator/sfValidatorDateRangeTest.php
index 4beb005f5..a20a0bdd0 100644
--- a/test/unit/validator/sfValidatorDateRangeTest.php
+++ b/test/unit/validator/sfValidatorDateRangeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,32 +11,32 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
 try {
-    new sfValidatorDateRange();
+    new \sfValidatorDateRange();
     $t->fail('__construct() throws a sfValidatorError if you don\'t pass a from_date and a to_date option');
     $t->skip('', 1);
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws a RuntimeException if you don\'t pass a from_date and a to_date option');
 }
 
-$v = new sfValidatorDateRange(array(
-    'from_date' => new sfValidatorDate(array('required' => false)),
-    'to_date' => new sfValidatorDate(array('required' => false)),
-));
+$v = new \sfValidatorDateRange([
+    'from_date' => new \sfValidatorDate(['required' => false]),
+    'to_date' => new \sfValidatorDate(['required' => false]),
+]);
 
 // ->clean()
 $t->diag('->clean()');
 
-$values = $v->clean(array('from' => '2008-01-01', 'to' => '2009-01-01'));
-$t->is($values, array('from' => '2008-01-01', 'to' => '2009-01-01'), '->clean() returns the from and to values');
+$values = $v->clean(['from' => '2008-01-01', 'to' => '2009-01-01']);
+$t->is($values, ['from' => '2008-01-01', 'to' => '2009-01-01'], '->clean() returns the from and to values');
 
 try {
-    $v->clean(array('from' => '2008-01-01', 'to' => '1998-01-01'));
+    $v->clean(['from' => '2008-01-01', 'to' => '1998-01-01']);
     $t->fail('->clean() throws a sfValidatorError if the from date is after the to date');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the from date is after the to date');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -43,19 +44,19 @@
 // custom field names
 $t->diag('Custom field names options');
 
-$v = new sfValidatorDateRange(array(
-    'from_date' => new sfValidatorDate(array('required' => true)),
-    'to_date' => new sfValidatorDate(array('required' => true)),
+$v = new \sfValidatorDateRange([
+    'from_date' => new \sfValidatorDate(['required' => true]),
+    'to_date' => new \sfValidatorDate(['required' => true]),
     'from_field' => 'custom_from',
     'to_field' => 'custom_to',
-));
+]);
 
 try {
-    $v->clean(array('from' => '2008-01-01', 'to' => '1998-01-01'));
+    $v->clean(['from' => '2008-01-01', 'to' => '1998-01-01']);
     $t->fail('->clean() take into account custom fields');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() take into account custom fields');
 }
 
-$values = $v->clean(array('custom_from' => '2008-01-01', 'custom_to' => '2009-01-01'));
-$t->is($values, array('custom_from' => '2008-01-01', 'custom_to' => '2009-01-01'), '->clean() returns the from and to values for custom field names');
+$values = $v->clean(['custom_from' => '2008-01-01', 'custom_to' => '2009-01-01']);
+$t->is($values, ['custom_from' => '2008-01-01', 'custom_to' => '2009-01-01'], '->clean() returns the from and to values for custom field names');
diff --git a/test/unit/validator/sfValidatorDateTest.php b/test/unit/validator/sfValidatorDateTest.php
index a1b2b1921..cf1086443 100644
--- a/test/unit/validator/sfValidatorDateTest.php
+++ b/test/unit/validator/sfValidatorDateTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(52);
+$t = new \lime_test(52);
 
-$v = new sfValidatorDate();
+$v = new \sfValidatorDate();
 
 // ->clean()
 $t->diag('->clean()');
@@ -29,7 +30,7 @@
     $v->clean('This is not a date');
     $t->fail('->clean() throws a sfValidatorError if the date is a string and is not parsable by strtotime');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the date is a string and is not parsable by strtotime');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -40,34 +41,34 @@
 
 // validate date array
 $t->diag('validate date array');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15)), '2005-10-15', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => '2005', 'month' => '10', 'day' => '15')), '2005-10-15', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => '', 'month' => '', 'day' => '')), null, '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2008, 'month' => 02, 'day' => 29)), '2008-02-29', '->clean() recognises a leapyear');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15]), '2005-10-15', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => '2005', 'month' => '10', 'day' => '15']), '2005-10-15', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => '', 'month' => '', 'day' => '']), null, '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2008, 'month' => 02, 'day' => 29]), '2008-02-29', '->clean() recognises a leapyear');
 
 try {
-    $v->clean(array('year' => '', 'month' => 1, 'day' => 15));
+    $v->clean(['year' => '', 'month' => 1, 'day' => 15]);
     $t->fail('->clean() throws a sfValidatorError if the date is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the date is not valid');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 try {
-    $v->clean(array('year' => -2, 'month' => 1, 'day' => 15));
+    $v->clean(['year' => -2, 'month' => 1, 'day' => 15]);
     $t->fail('->clean() throws a sfValidatorError if the date is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the date is not valid');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 try {
-    $v->clean(array('year' => 2008, 'month' => 2, 'day' => 30));
+    $v->clean(['year' => 2008, 'month' => 2, 'day' => 30]);
     $t->fail('->clean() throws a sfValidatorError if the date is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the date is not valid');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -76,13 +77,13 @@
 $t->diag('validate regex');
 $v->setOption('date_format', '~(?P<day>\d{2})/(?P<month>\d{2})/(?P<year>\d{4})~');
 $t->is($v->clean('18/10/2005'), '2005-10-18', '->clean() accepts a regular expression to match dates');
-$t->is($v->clean(array('year' => '2005', 'month' => '10', 'day' => '18')), '2005-10-18', '->clean() accepts a regular expression when cleaning an array');
+$t->is($v->clean(['year' => '2005', 'month' => '10', 'day' => '18']), '2005-10-18', '->clean() accepts a regular expression when cleaning an array');
 
 try {
     $v->clean('2005-10-18');
     $t->fail('->clean() throws a sfValidatorError if the date does not match the regex');
     $t->skip('', 2);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the date does not match the regex');
     $t->like($e->getMessage(), '/'.preg_quote(htmlspecialchars($v->getOption('date_format'), ENT_QUOTES, 'UTF-8'), '/').'/', '->clean() returns the expected date format in the error message');
     $t->is($e->getCode(), 'bad_format', '->clean() throws a sfValidatorError');
@@ -93,7 +94,7 @@
 try {
     $v->clean('2005-10-18');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->like($e->getMessage(), '/'.preg_quote('dd/mm/YYYY', '/').'/', '->clean() returns the expected date format error if provided');
 }
 
@@ -102,20 +103,20 @@
 // option with_time
 $t->diag('option with_time');
 $v->setOption('with_time', true);
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10, 'second' => 15)), '2005-10-15 12:10:15', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => '2005', 'month' => '10', 'day' => '15', 'hour' => '12', 'minute' => '10', 'second' => '15')), '2005-10-15 12:10:15', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => '', 'second' => '')), null, '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10, 'second' => '')), '2005-10-15 12:10:00', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10)), '2005-10-15 12:10:00', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 0, 'minute' => 10)), '2005-10-15 00:10:00', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => '0', 'minute' => 10)), '2005-10-15 00:10:00', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 10)), '2005-10-15 10:00:00', '->clean() accepts an array as an input');
-$t->is($v->clean(array('year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 0)), '2005-10-15 00:00:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10, 'second' => 15]), '2005-10-15 12:10:15', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => '2005', 'month' => '10', 'day' => '15', 'hour' => '12', 'minute' => '10', 'second' => '15']), '2005-10-15 12:10:15', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => '', 'second' => '']), null, '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10, 'second' => '']), '2005-10-15 12:10:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 10]), '2005-10-15 12:10:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 0, 'minute' => 10]), '2005-10-15 00:10:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => '0', 'minute' => 10]), '2005-10-15 00:10:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 10]), '2005-10-15 10:00:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['year' => 2005, 'month' => 10, 'day' => 15, 'hour' => 0]), '2005-10-15 00:00:00', '->clean() accepts an array as an input');
 
 try {
-    $v->clean(array('year' => 2005, 'month' => 1, 'day' => 15, 'hour' => 12, 'minute' => '', 'second' => 12));
+    $v->clean(['year' => 2005, 'month' => 1, 'day' => 15, 'hour' => 12, 'minute' => '', 'second' => 12]);
     $t->fail('->clean() throws a sfValidatorError if the time is not valid');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the time is not valid');
 }
 
@@ -137,17 +138,17 @@
 $t->is($v->clean(time()), time(), '->clean() output format can be change with the date_output option');
 
 // required
-$v = new sfValidatorDate();
-foreach (array(
-    array('year' => '', 'month' => '', 'day' => ''),
-    array('year' => null, 'month' => null, 'day' => null),
+$v = new \sfValidatorDate();
+foreach ([
+    ['year' => '', 'month' => '', 'day' => ''],
+    ['year' => null, 'month' => null, 'day' => null],
     '',
     null,
-) as $input) {
+] as $input) {
     try {
         $v->clean($input);
         $t->fail('->clean() throws an exception if the date is empty and required is true');
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass('->clean() throws an exception if the date is empty and required is true');
     }
 }
@@ -161,14 +162,14 @@
 try {
     $v->clean('18 october 2004');
     $t->fail('->clean() throws an exception if the date is not within the range provided by the min/max options');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
 }
 
 try {
     $v->clean('18 october 2008');
     $t->fail('->clean() throws an exception if the date is not within the range provided by the min/max options');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
 }
 
@@ -177,12 +178,12 @@
 $v->setOption('min', '1805-12-31 10:00:00');
 $v->setOption('max', '2107-12-31 10:50:00');
 $t->is($v->clean('18 october 2105'), '2105-10-18', '->clean() can accept a max/min option string');
-$t->is($v->clean(array('year' => 1906, 'month' => 2, 'day' => 13)), '1906-02-13', '->clean() can accept a max/min option array');
+$t->is($v->clean(['year' => 1906, 'month' => 2, 'day' => 13]), '1906-02-13', '->clean() can accept a max/min option array');
 
 try {
     $v->clean('18 october 1804');
     $t->fail('->clean() throws an exception if the date is not within the range provided by the min/max options');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
     $t->is($e->getMessage(), 'The date must be after 31/12/1805 10:00:00.', '->clean() check exception message');
 }
@@ -190,19 +191,19 @@
 try {
     $v->clean('18 october 2108');
     $t->fail('->clean() throws an exception if the date is not within the range provided by the min/max options');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
     $t->is($e->getMessage(), 'The date must be before 31/12/2107 10:50:00.', '->clean() check exception message');
 }
 
 // timezones
-$defaultTimezone = new DateTimeZone(date_default_timezone_get());
-$otherTimezone = new DateTimeZone('US/Pacific');
-if ($defaultTimezone->getOffset(new DateTime()) == $otherTimezone->getOffset(new DateTime())) {
-    $otherTimezone = new DateTimeZone('US/Eastern');
+$defaultTimezone = new \DateTimeZone(date_default_timezone_get());
+$otherTimezone = new \DateTimeZone('US/Pacific');
+if ($defaultTimezone->getOffset(new \DateTime()) == $otherTimezone->getOffset(new \DateTime())) {
+    $otherTimezone = new \DateTimeZone('US/Eastern');
 }
 
-$date = new DateTime('2000-01-01T00:00:00-00:00');
+$date = new \DateTime('2000-01-01T00:00:00-00:00');
 $date->setTimezone($otherTimezone);
 $v->setOption('min', null);
 $v->setOption('max', null);
diff --git a/test/unit/validator/sfValidatorDateTimeTest.php b/test/unit/validator/sfValidatorDateTimeTest.php
index 32145ff5e..e17b5afb4 100644
--- a/test/unit/validator/sfValidatorDateTimeTest.php
+++ b/test/unit/validator/sfValidatorDateTimeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,14 +11,14 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
-$v = new sfValidatorDateTime();
+$v = new \sfValidatorDateTime();
 
-$t->ok($v instanceof sfValidatorDate, 'sfValidatorDateTime extends sfValidatorDate');
+$t->ok($v instanceof \sfValidatorDate, 'sfValidatorDateTime extends sfValidatorDate');
 
 // with_time option
 $t->diag('with_time option');
 $t->is($v->clean(time()), date('Y-m-d H:i:s', time()), '->clean() validates date with time');
-$t->is($v->clean(array('year' => 2005, 'month' => 1, 'day' => 4, 'hour' => 2, 'minute' => 23, 'second' => 33)), '2005-01-04 02:23:33', '->clean() validates date with time');
+$t->is($v->clean(['year' => 2005, 'month' => 1, 'day' => 4, 'hour' => 2, 'minute' => 23, 'second' => 33]), '2005-01-04 02:23:33', '->clean() validates date with time');
 $t->is($v->clean('1855-08-25 13:22:56'), '1855-08-25 13:22:56', '->clean() validates date with time');
diff --git a/test/unit/validator/sfValidatorDecoratorTest.php b/test/unit/validator/sfValidatorDecoratorTest.php
index 06031db28..63282ae0e 100644
--- a/test/unit/validator/sfValidatorDecoratorTest.php
+++ b/test/unit/validator/sfValidatorDecoratorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,32 +11,32 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(20);
+$t = new \lime_test(20);
 
-class MyValidator extends sfValidatorDecorator
+class MyValidator extends \sfValidatorDecorator
 {
     public function getValidator()
     {
-        return new sfValidatorString(array('min_length' => 2, 'trim' => true), array('required' => 'This string is required.'));
+        return new \sfValidatorString(['min_length' => 2, 'trim' => true], ['required' => 'This string is required.']);
     }
 }
 
 // __construct()
 $t->diag('__construct()');
-$v = new MyValidator(array('required' => false));
+$v = new \MyValidator(['required' => false]);
 $t->is($v->clean(null), null, '__construct() options override the embedded validator options');
-$v = new MyValidator(array(), array('required' => 'This is required.'));
+$v = new \MyValidator([], ['required' => 'This is required.']);
 
 try {
     $v->clean(null);
     $t->fail('->clean() throws a sfValidatorError if the value is required');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the value is required');
     $t->is($e->getMessage(), 'This is required.', '__construct() messages override the embedded validator messages');
 }
 
-$v = new MyValidator();
+$v = new \MyValidator();
 
 // ->getErrorCodes()
 $t->diag('->getErrorCodes()');
@@ -55,23 +56,23 @@ public function getValidator()
 
 // ->getMessage() ->getMessages() ->setMessage() ->setMessages()
 $t->diag('->getMessage() ->getMessages() ->setMessage() ->setMessages()');
-$v = new MyValidator();
+$v = new \MyValidator();
 $t->is($v->getMessage('required'), 'This string is required.', '->getMessage() returns a message from the embedded validator');
 $v->setMessage('invalid', 'This string is invalid.');
-$t->is($v->getMessages(), array('required' => 'This string is required.', 'invalid' => 'This string is invalid.', 'max_length' => '"%value%" is too long (%max_length% characters max).', 'min_length' => '"%value%" is too short (%min_length% characters min).'), '->getMessages() returns messages from the embedded validator');
-$v->setMessages(array('required' => 'Required...'));
-$t->is($v->getMessages(), array('required' => 'Required...', 'invalid' => 'Invalid.'), '->setMessages() sets all messages for the embedded validator');
+$t->is($v->getMessages(), ['required' => 'This string is required.', 'invalid' => 'This string is invalid.', 'max_length' => '"%value%" is too long (%max_length% characters max).', 'min_length' => '"%value%" is too short (%min_length% characters min).'], '->getMessages() returns messages from the embedded validator');
+$v->setMessages(['required' => 'Required...']);
+$t->is($v->getMessages(), ['required' => 'Required...', 'invalid' => 'Invalid.'], '->setMessages() sets all messages for the embedded validator');
 
 // ->getOption() ->getOptions() ->hasOption() ->getOptions() ->setOptions()
-$v = new MyValidator();
+$v = new \MyValidator();
 $t->is($v->getOption('trim'), true, '->getOption() returns an option from the embedded validator');
 $v->setOption('trim', false);
-$t->is($v->getOptions(), array('required' => true, 'trim' => false, 'empty_value' => '', 'min_length' => 2, 'max_length' => null), '->getOptions() returns an array of options from the embedded validator');
+$t->is($v->getOptions(), ['required' => true, 'trim' => false, 'empty_value' => '', 'min_length' => 2, 'max_length' => null], '->getOptions() returns an array of options from the embedded validator');
 $t->is($v->hasOption('min_length'), true, '->hasOption() returns true if the embedded validator has a given option');
-$v->setOptions(array('min_length' => 10));
-$t->is($v->getOptions(), array('required' => true, 'trim' => false, 'empty_value' => null, 'min_length' => 10), '->setOptions() sets all options for the embedded validator');
+$v->setOptions(['min_length' => 10]);
+$t->is($v->getOptions(), ['required' => true, 'trim' => false, 'empty_value' => null, 'min_length' => 10], '->setOptions() sets all options for the embedded validator');
 
-$v = new MyValidator();
+$v = new \MyValidator();
 
 // ->clean()
 $t->diag('->clean()');
@@ -80,7 +81,7 @@ public function getValidator()
     $v->clean(null);
     $t->fail('->clean() throws a sfValidatorError if the value is required');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the value is required');
     $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
 }
@@ -89,14 +90,14 @@ public function getValidator()
     $v->clean('f');
     $t->fail('->clean() throws a sfValidatorError if the wrapped validator failed');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the wrapped validator failed');
     $t->is($e->getCode(), 'min_length', '->clean() throws a sfValidatorError');
 }
 
 $t->is($v->clean('  foo  '), 'foo', '->clean() cleans the value by executing the clean() method from the wrapped validator');
 
-class FakeValidator extends sfValidatorDecorator
+class FakeValidator extends \sfValidatorDecorator
 {
     protected function getValidator()
     {
@@ -105,8 +106,8 @@ protected function getValidator()
 }
 
 try {
-    $v = new FakeValidator();
+    $v = new \FakeValidator();
     $t->fail('->clean() throws a RuntimeException if getValidator() does not return a sfValidator instance');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('->clean() throws a RuntimeException if getValidator() does not return a sfValidator instance');
 }
diff --git a/test/unit/validator/sfValidatorEmailTest.php b/test/unit/validator/sfValidatorEmailTest.php
index 922e12413..4d3e6c4bc 100644
--- a/test/unit/validator/sfValidatorEmailTest.php
+++ b/test/unit/validator/sfValidatorEmailTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,31 +11,31 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
-$v = new sfValidatorEmail();
+$v = new \sfValidatorEmail();
 
 // ->clean()
 $t->diag('->clean()');
-foreach (array(
+foreach ([
     'fabien.potencier@symfony-project.com',
     'example@example.co.uk',
     'fabien_potencier@example.fr',
-) as $url) {
+] as $url) {
     $t->is($v->clean($url), $url, '->clean() checks that the value is a valid email');
 }
 
-foreach (array(
+foreach ([
     'example',
     'example@',
     'example@localhost',
     'example@example.com@example.com',
-) as $nonUrl) {
+] as $nonUrl) {
     try {
         $v->clean($nonUrl);
         $t->fail('->clean() throws an sfValidatorError if the value is not a valid email');
         $t->skip('', 1);
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass('->clean() throws an sfValidatorError if the value is not a valid email');
         $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
     }
diff --git a/test/unit/validator/sfValidatorEqualTest.php b/test/unit/validator/sfValidatorEqualTest.php
index a8e7f6361..f95b42e28 100644
--- a/test/unit/validator/sfValidatorEqualTest.php
+++ b/test/unit/validator/sfValidatorEqualTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,19 +11,19 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
 // __construct()
 $t->diag('__construct()');
 
 try {
-    new sfValidatorEqual();
+    new \sfValidatorEqual();
     $t->fail('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
 }
 
-$v = new sfValidatorEqual(array('value' => 'foo'));
+$v = new \sfValidatorEqual(['value' => 'foo']);
 
 // ->clean()
 $t->diag('->clean()');
@@ -35,7 +36,7 @@
     $v->clean('bar');
     $t->fail('->clean() fails values are not equal');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() fails values are not equal');
     $t->is($e->getCode(), 'not_equal', '->clean() throws a sfValidatorError');
 }
@@ -45,7 +46,7 @@
 try {
     $v->clean('bar');
     $t->fail('"not_equal" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Not equal', '"not_equal" error message customization');
 }
 
@@ -56,7 +57,7 @@
     $v->clean(0);
     $t->fail('"strict" option set the operator for comparaison');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"strict" option set the operator for comparaison');
     $t->is($e->getCode(), 'not_strictly_equal', '->clean() throws a sfValidatorError');
 }
@@ -66,6 +67,6 @@
 try {
     $v->clean(0);
     $t->fail('"not_strictly_equal" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Not strictly equal', '"not_strictly_equal" error message customization');
 }
diff --git a/test/unit/validator/sfValidatorErrorSchemaTest.php b/test/unit/validator/sfValidatorErrorSchemaTest.php
index 71d685421..f25b39185 100644
--- a/test/unit/validator/sfValidatorErrorSchemaTest.php
+++ b/test/unit/validator/sfValidatorErrorSchemaTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,37 +11,37 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(33);
+$t = new \lime_test(33);
 
-$v1 = new sfValidatorString();
-$v2 = new sfValidatorString();
+$v1 = new \sfValidatorString();
+$v2 = new \sfValidatorString();
 
-$e1 = new sfValidatorError($v1, 'max_length', array('value' => 'foo', 'max_length' => 1));
-$e2 = new sfValidatorError($v2, 'min_length', array('value' => 'bar', 'min_length' => 5));
+$e1 = new \sfValidatorError($v1, 'max_length', ['value' => 'foo', 'max_length' => 1]);
+$e2 = new \sfValidatorError($v2, 'min_length', ['value' => 'bar', 'min_length' => 5]);
 
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 
 // __construct()
 $t->diag('__construct()');
 $t->is($e->getValidator(), $v1, '__construct() takes a sfValidator as its first argument');
-$e = new sfValidatorErrorSchema($v1, array('e1' => $e1, 'e2' => $e2));
-$t->is($e->getErrors(), array('e1' => $e1, 'e2' => $e2), '__construct() can take an array of sfValidatorError as its second argument (depreciated)');
+$e = new \sfValidatorErrorSchema($v1, ['e1' => $e1, 'e2' => $e2]);
+$t->is($e->getErrors(), ['e1' => $e1, 'e2' => $e2], '__construct() can take an array of sfValidatorError as its second argument (depreciated)');
 
 // ->addError() ->getErrors()
 $t->diag('->addError() ->getErrors()');
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 $e->addError($e1);
 $e->addError($e2, 'e2');
 $e->addError($e1, '2');
-$t->is($e->getErrors(), array($e1, 'e2' => $e2, '2' => $e1), '->addError() adds an error to the error schema');
+$t->is($e->getErrors(), [$e1, 'e2' => $e2, '2' => $e1], '->addError() adds an error to the error schema');
 
 $t->diag('embedded errors');
-$es1 = new sfValidatorErrorSchema(new sfValidatorString());
+$es1 = new \sfValidatorErrorSchema(new \sfValidatorString());
 $es1->addError($e1);
 $es1->addError($e1, 'e1');
 $es1->addError($e2, 'e2');
 
-$es = new sfValidatorErrorSchema(new sfValidatorString());
+$es = new \sfValidatorErrorSchema(new \sfValidatorString());
 $es->addError($e1);
 $es->addError($e1, 'e1');
 $es->addError($es1, 'e2');
@@ -50,7 +51,7 @@
 $es->addError($e2);
 $t->is($es->getCode(), 'max_length min_length e1 [max_length min_length] e2 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
 
-$es2 = new sfValidatorErrorSchema(new sfValidatorString());
+$es2 = new \sfValidatorErrorSchema(new \sfValidatorString());
 $es2->addError($e1);
 $es2->addError($e1, 'e1');
 $es2->addError($e2, 'e2');
@@ -58,7 +59,7 @@
 $es->addError($es2, 'e3');
 $t->is($es->getCode(), 'max_length min_length e1 [max_length min_length] e2 [max_length e1 [max_length] e2 [min_length]] e3 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
 
-$es3 = new sfValidatorErrorSchema(new sfValidatorString());
+$es3 = new \sfValidatorErrorSchema(new \sfValidatorString());
 $es3->addError($e1);
 $es3->addError($e1, 'e1');
 $es3->addError($e2, 'e2');
@@ -66,20 +67,20 @@
 $es->addError($es3);
 $t->is($es->getCode(), 'max_length min_length max_length e1 [max_length min_length max_length] e2 [max_length min_length e1 [max_length] e2 [min_length]] e3 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
 
-$es1 = new sfValidatorErrorSchema($v1);
+$es1 = new \sfValidatorErrorSchema($v1);
 $es1->addError($e1);
 $es1->addError($e1, 'e1');
 $es1->addError($e2, 'e2');
-$es = new sfValidatorErrorSchema($v1);
+$es = new \sfValidatorErrorSchema($v1);
 $es->addError($e1);
 $es->addError($e1, 'e1');
 $es->addError($es1, 'e2');
 
-$es1 = new sfValidatorErrorSchema($v1);
+$es1 = new \sfValidatorErrorSchema($v1);
 $es1->addError($e1);
 $es1->addError($e1, 'e1');
 $es1->addError($e2, 'e2');
-$es2 = new sfValidatorErrorSchema($v1);
+$es2 = new \sfValidatorErrorSchema($v1);
 $es2->addError($e1);
 $es2->addError($e1, 'e1');
 $es2->addError($es1, 'e2');
@@ -89,26 +90,26 @@
 
 // ->addErrors()
 $t->diag('->addErrors()');
-$es1 = new sfValidatorErrorSchema($v1);
+$es1 = new \sfValidatorErrorSchema($v1);
 $es1->addError($e1);
 $es1->addError($e1, 0);
 $es1->addError($e2, '1');
-$es = new sfValidatorErrorSchema($v1);
+$es = new \sfValidatorErrorSchema($v1);
 $es->addErrors($es1);
-$t->is($es->getGlobalErrors(), array($e1), '->addErrors() adds an array of errors to the current error');
-$t->is($es->getNamedErrors(), array(0 => $e1, '1' => $e2), '->addErrors() merges a sfValidatorErrorSchema to the current error');
+$t->is($es->getGlobalErrors(), [$e1], '->addErrors() adds an array of errors to the current error');
+$t->is($es->getNamedErrors(), [0 => $e1, '1' => $e2], '->addErrors() merges a sfValidatorErrorSchema to the current error');
 
 // ->getGlobalErrors()
 $t->diag('->getGlobalErrors()');
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 $e->addError($e1);
 $e->addError($e2, 'e2');
 $e->addError($e1, '2');
-$t->is($e->getGlobalErrors(), array($e1), '->getGlobalErrors() returns all globals/non named errors');
+$t->is($e->getGlobalErrors(), [$e1], '->getGlobalErrors() returns all globals/non named errors');
 
 // ->getNamedErrors()
 $t->diag('->getNamedErrors()');
-$t->is($e->getNamedErrors(), array('e2' => $e2, '2' => $e1), '->getNamedErrors() returns all named errors');
+$t->is($e->getNamedErrors(), ['e2' => $e2, '2' => $e1], '->getNamedErrors() returns all named errors');
 
 // ->getValue()
 $t->diag('->getValue()');
@@ -116,8 +117,8 @@
 
 // ->getArguments()
 $t->diag('->getArguments()');
-$t->is($e->getArguments(), array(), '->getArguments() always returns an empty array');
-$t->is($e->getArguments(true), array(), '->getArguments() always returns an empty array');
+$t->is($e->getArguments(), [], '->getArguments() always returns an empty array');
+$t->is($e->getArguments(true), [], '->getArguments() always returns an empty array');
 
 // ->getMessageFormat()
 $t->diag('->getMessageFormat()');
@@ -133,26 +134,26 @@
 
 // implements Countable
 $t->diag('implements Countable');
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 $e->addError($e1, 'e1');
 $e->addError($e2, 'e2');
 $t->is(count($e), 2, '"sfValidatorError" implements Countable');
 
 // implements Iterator
 $t->diag('implements Iterator');
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 $e->addError($e1, 'e1');
 $e->addError($e2);
 $e->addError($e2, '2');
-$errors = array();
+$errors = [];
 foreach ($e as $name => $error) {
     $errors[$name] = $error;
 }
-$t->is($errors, array('e1' => $e1, 0 => $e2, '2' => $e2), '"sfValidatorErrorSchema" implements the Iterator interface');
+$t->is($errors, ['e1' => $e1, 0 => $e2, '2' => $e2], '"sfValidatorErrorSchema" implements the Iterator interface');
 
 // implements ArrayAccess
 $t->diag('implements ArrayAccess');
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 $e->addError($e1, 'e1');
 $e->addError($e2);
 $e->addError($e2, '2');
@@ -165,51 +166,51 @@
 try {
     $e['e1'] = $e2;
     $t->fail('"sfValidatorErrorSchema" implements the ArrayAccess interface');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('"sfValidatorErrorSchema" implements the ArrayAccess interface');
 }
 
 // implements Serializable
 $t->diag('implements Serializable');
 
-class NotSerializable implements Serializable
+class NotSerializable implements \Serializable
 {
     public function __serialize()
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 
     public function __unserialize($data)
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 
     public function serialize()
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 
     public function unserialize($serialized)
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 }
 
 function will_crash($a)
 {
-    return serialize(new sfValidatorErrorSchema(new sfValidatorString()));
+    return serialize(new \sfValidatorErrorSchema(new \sfValidatorString()));
 }
 
-$a = new NotSerializable();
+$a = new \NotSerializable();
 
 try {
     $serialized = will_crash($a);
     $t->pass('"sfValidatorErrorSchema" implements Serializable');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('"sfValidatorErrorSchema" implements Serializable');
 }
 
-$e = new sfValidatorErrorSchema($v1);
+$e = new \sfValidatorErrorSchema($v1);
 $e1 = unserialize($serialized);
 $t->is($e1->getMessage(), $e->getMessage(), '"sfValidatorErrorSchema" implements Serializable');
 $t->is($e1->getCode(), $e->getCode(), '"sfValidatorErrorSchema" implements Serializable');
diff --git a/test/unit/validator/sfValidatorErrorTest.php b/test/unit/validator/sfValidatorErrorTest.php
index 2c235fd37..c1f75735a 100644
--- a/test/unit/validator/sfValidatorErrorTest.php
+++ b/test/unit/validator/sfValidatorErrorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,17 +11,17 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(14);
+$t = new \lime_test(14);
 
-$v = new sfValidatorString();
+$v = new \sfValidatorString();
 
-$e = new sfValidatorError($v, 'max_length', array('value' => 'foo<br />', 'max_length' => 1));
+$e = new \sfValidatorError($v, 'max_length', ['value' => 'foo<br />', 'max_length' => 1]);
 
 // ->getValue()
 $t->diag('->getValue()');
 $t->is($e->getValue(), 'foo<br />', '->getValue() returns the value that has been validated with the validator');
 
-$e1 = new sfValidatorError($v, 'max_length', array('max_length' => 1));
+$e1 = new \sfValidatorError($v, 'max_length', ['max_length' => 1]);
 $t->is($e1->getValue(), null, '->getValue() returns null if there is no value key in arguments');
 
 // ->getValidator()
@@ -29,8 +30,8 @@
 
 // ->getArguments()
 $t->diag('->getArguments()');
-$t->is($e->getArguments(), array('%value%' => 'foo&lt;br /&gt;', '%max_length%' => 1), '->getArguments() returns the arguments needed to format the error message, escaped according to the current charset');
-$t->is($e->getArguments(true), array('value' => 'foo<br />', 'max_length' => 1), '->getArguments() takes a Boolean as its first argument to return the raw arguments');
+$t->is($e->getArguments(), ['%value%' => 'foo&lt;br /&gt;', '%max_length%' => 1], '->getArguments() returns the arguments needed to format the error message, escaped according to the current charset');
+$t->is($e->getArguments(true), ['value' => 'foo<br />', 'max_length' => 1], '->getArguments() takes a Boolean as its first argument to return the raw arguments');
 
 // ->getMessageFormat()
 $t->diag('->getMessageFormat()');
@@ -54,40 +55,40 @@
 // we test with non serializable objects
 // to ensure that the errors are always serializable
 // even if you use PDO as a session handler
-class NotSerializable implements Serializable
+class NotSerializable implements \Serializable
 {
     public function __serialize()
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 
     public function __unserialize($data)
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 
     public function serialize()
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 
     public function unserialize($serialized)
     {
-        throw new Exception('Not serializable');
+        throw new \Exception('Not serializable');
     }
 }
 
 function will_crash($a)
 {
-    return serialize(new sfValidatorError(new sfValidatorString(), 'max_length', array('value' => 'foo<br />', 'max_length' => 1)));
+    return serialize(new \sfValidatorError(new \sfValidatorString(), 'max_length', ['value' => 'foo<br />', 'max_length' => 1]));
 }
 
-$a = new NotSerializable();
+$a = new \NotSerializable();
 
 try {
     $serialized = will_crash($a);
     $t->pass('sfValidatorError implements Serializable');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('sfValidatorError implements Serializable');
 }
 
diff --git a/test/unit/validator/sfValidatorFileMultiTest.php b/test/unit/validator/sfValidatorFileMultiTest.php
index 8c2e267b6..207822e29 100644
--- a/test/unit/validator/sfValidatorFileMultiTest.php
+++ b/test/unit/validator/sfValidatorFileMultiTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(9);
+$t = new \lime_test(9);
 
 $tmpDir = sys_get_temp_dir();
 $content = 'This is an ASCII file.';
@@ -20,25 +21,25 @@
 
 // ->clean()
 $t->diag('->clean()');
-$v = new sfValidatorFileMulti();
+$v = new \sfValidatorFileMulti();
 
-$f = $v->clean(array(
-    array('tmp_name' => $tmpDir.'/test.txt'),
-    array('tmp_name' => $tmpDir.'/test2.txt'),
-));
+$f = $v->clean([
+    ['tmp_name' => $tmpDir.'/test.txt'],
+    ['tmp_name' => $tmpDir.'/test2.txt'],
+]);
 
 $t->ok(is_array($f), '->clean() returns an array of sfValidatedFile instances');
 
-$t->ok($f[0] instanceof sfValidatedFile, '->clean() returns an array of sfValidatedFile');
+$t->ok($f[0] instanceof \sfValidatedFile, '->clean() returns an array of sfValidatedFile');
 $t->is($f[0]->getOriginalName(), '', '->clean() returns an array of sfValidatedFile with an empty original name if the name is not passed in the initial value');
 $t->is($f[0]->getSize(), strlen($content), '->clean() returns an array of sfValidatedFile with a computed file size if the size is not passed in the initial value');
 $t->is($f[0]->getType(), 'text/plain', '->clean() returns an array of sfValidatedFile with a guessed content type');
 
-$t->ok($f[1] instanceof sfValidatedFile, '->clean() returns an array of sfValidatedFile');
+$t->ok($f[1] instanceof \sfValidatedFile, '->clean() returns an array of sfValidatedFile');
 $t->is($f[1]->getOriginalName(), '', '->clean() returns an array of sfValidatedFile with an empty original name if the name is not passed in the initial value');
 $t->is($f[1]->getSize(), strlen($content2), '->clean() returns an array of sfValidatedFile with a computed file size if the size is not passed in the initial value');
 $t->is($f[1]->getType(), 'text/plain', '->clean() returns an array of sfValidatedFile with a guessed content type');
 
 unlink($tmpDir.'/test.txt');
 unlink($tmpDir.'/test2.txt');
-sfToolkit::clearDirectory($tmpDir.'/foo');
+\sfToolkit::clearDirectory($tmpDir.'/foo');
diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php
index ae34001cd..5f0034e45 100755
--- a/test/unit/validator/sfValidatorFileTest.php
+++ b/test/unit/validator/sfValidatorFileTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(70);
+$t = new \lime_test(70);
 
 $tmpDir = sys_get_temp_dir();
 $content = 'This is an ASCII file.';
 file_put_contents($tmpDir.'/test.txt', $content);
 
-class testValidatorFile extends sfValidatorFile
+class testValidatorFile extends \sfValidatorFile
 {
     public function getMimeType($file, $fallback)
     {
@@ -51,25 +52,25 @@ public function getMimeTypesFromCategory($category)
 
 // ->getMimeTypesFromCategory()
 $t->diag('->getMimeTypesFromCategory()');
-$v = new testValidatorFile();
+$v = new \testValidatorFile();
 
 try {
     $t->is($v->getMimeTypesFromCategory('non_existant_category'), '');
     $t->fail('->getMimeTypesFromCategory() throws an InvalidArgumentException if the category does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getMimeTypesFromCategory() throws an InvalidArgumentException if the category does not exist');
 }
 $categories = $v->getOption('mime_categories');
 $t->is($v->getMimeTypesFromCategory('web_images'), $categories['web_images'], '->getMimeTypesFromCategory() returns an array of mime types for a given category');
-$v->setOption('mime_categories', array_merge($v->getOption('mime_categories'), array('text' => array('text/plain'))));
-$t->is($v->getMimeTypesFromCategory('text'), array('text/plain'), '->getMimeTypesFromCategory() returns an array of mime types for a given category');
+$v->setOption('mime_categories', array_merge($v->getOption('mime_categories'), ['text' => ['text/plain']]));
+$t->is($v->getMimeTypesFromCategory('text'), ['text/plain'], '->getMimeTypesFromCategory() returns an array of mime types for a given category');
 
 // ->guessFromFileinfo()
 $t->diag('->guessFromFileinfo()');
 if (!function_exists('finfo_open')) {
     $t->skip('finfo_open is not available', 2);
 } else {
-    $v = new testValidatorFile();
+    $v = new \testValidatorFile();
     $t->is($v->guessFromFileinfo($tmpDir.'/test.txt'), 'text/plain', '->guessFromFileinfo() guesses the type of a given file');
     $t->is($v->guessFromFileinfo($tmpDir.'/foo.txt'), null, '->guessFromFileinfo() returns null if the file type is not guessable');
 }
@@ -79,7 +80,7 @@ public function getMimeTypesFromCategory($category)
 if (!function_exists('mime_content_type')) {
     $t->skip('mime_content_type is not available', 2);
 } else {
-    $v = new testValidatorFile();
+    $v = new \testValidatorFile();
     $mimeType = $v->guessFromMimeContentType($tmpDir.'/test.txt');
     if (version_compare(PHP_VERSION, '5.3', '<') && false === $mimeType) {
         $t->skip('mime_content_type has some issue with php 5.2', 1);
@@ -91,7 +92,7 @@ public function getMimeTypesFromCategory($category)
 
 // ->guessFromFileBinary()
 $t->diag('->guessFromFileBinary()');
-$v = new testValidatorFile();
+$v = new \testValidatorFile();
 $t->is($v->guessFromFileBinary($tmpDir.'/test.txt'), 'text/plain', '->guessFromFileBinary() guesses the type of a given file');
 $t->is($v->guessFromFileBinary($tmpDir.'/foo.txt'), null, '->guessFromFileBinary() returns null if the file type is not guessable');
 $t->like($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? '/^application\/x-(pie-executable|executable|sharedlib)$/' : '/^application/octet-stream$/', '->guessFromFileBinary() returns correct type if file is guessable');
@@ -99,45 +100,45 @@ public function getMimeTypesFromCategory($category)
 
 // ->getMimeType()
 $t->diag('->getMimeType()');
-$v = new testValidatorFile();
+$v = new \testValidatorFile();
 $t->is($v->getMimeType($tmpDir.'/test.txt', 'image/png'), 'text/plain', '->getMimeType() guesses the type of a given file');
 $t->is($v->getMimeType($tmpDir.'/foo.txt', 'text/plain'), 'text/plain', '->getMimeType() returns the default type if the file type is not guessable');
 
-$v->setOption('mime_type_guessers', array_merge(array(array($v, 'guessFromNothing')), $v->getOption('mime_type_guessers')));
+$v->setOption('mime_type_guessers', array_merge([[$v, 'guessFromNothing']], $v->getOption('mime_type_guessers')));
 $t->is($v->getMimeType($tmpDir.'/test.txt', 'image/png'), 'nothing/plain', '->getMimeType() takes all guessers from the mime_type_guessers option');
 
 // ->clean()
 $t->diag('->clean()');
-$v = new testValidatorFile();
+$v = new \testValidatorFile();
 
 try {
-    $v->clean(array('test' => true));
+    $v->clean(['test' => true]);
     $t->fail('->clean() throws an sfValidatorError if the given value is not well formatted');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the given value is not well formatted');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
-$f = $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
-$t->ok($f instanceof sfValidatedFile, '->clean() returns a sfValidatedFile instance');
+$f = $v->clean(['tmp_name' => $tmpDir.'/test.txt']);
+$t->ok($f instanceof \sfValidatedFile, '->clean() returns a sfValidatedFile instance');
 $t->is($f->getOriginalName(), '', '->clean() returns a sfValidatedFile with an empty original name if the name is not passed in the initial value');
 $t->is($f->getSize(), strlen($content), '->clean() returns a sfValidatedFile with a computed file size if the size is not passed in the initial value');
 $t->is($f->getType(), 'text/plain', '->clean() returns a sfValidatedFile with a guessed content type');
 
-class myValidatedFile extends sfValidatedFile
+class myValidatedFile extends \sfValidatedFile
 {
 }
 
 $v->setOption('validated_file_class', 'myValidatedFile');
-$f = $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
-$t->ok($f instanceof myValidatedFile, '->clean() can take a "validated_file_class" option');
+$f = $v->clean(['tmp_name' => $tmpDir.'/test.txt']);
+$t->ok($f instanceof \myValidatedFile, '->clean() can take a "validated_file_class" option');
 
-foreach (array(UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION) as $error) {
+foreach ([UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION] as $error) {
     try {
-        $v->clean(array('tmp_name' => $tmpDir.'/test.txt', 'error' => $error));
+        $v->clean(['tmp_name' => $tmpDir.'/test.txt', 'error' => $error]);
         $t->fail('->clean() throws an sfValidatorError if the error code is not UPLOAD_ERR_OK (0)');
         $t->skip('', 1);
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass('->clean() throws an sfValidatorError if the error code is not UPLOAD_ERR_OK (0)');
         $t->is($e->getCode(), $code = strtolower(str_replace('UPLOAD_ERR_', '', $e->getCode())), '->clean() throws an error code of '.$code);
     }
@@ -148,9 +149,9 @@ class myValidatedFile extends sfValidatedFile
 $v->setOption('max_size', 4);
 
 try {
-    $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
+    $v->clean(['tmp_name' => $tmpDir.'/test.txt']);
     $t->skip();
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the file size is too large');
     $t->is($e->getCode(), 'max_size', '->clean() throws an error code of max_size');
 }
@@ -161,22 +162,22 @@ class myValidatedFile extends sfValidatedFile
 $v->setOption('mime_types', 'web_images');
 
 try {
-    $v->clean(array('tmp_name' => $tmpDir.'/test.txt'));
+    $v->clean(['tmp_name' => $tmpDir.'/test.txt']);
     $t->skip();
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the file mime type is not in mime_types option');
     $t->is($e->getCode(), 'mime_types', '->clean() throws an error code of mime_types');
 }
 $v->setOption('mime_types', null);
 
 // required
-$v = new testValidatorFile();
+$v = new \testValidatorFile();
 
 try {
-    $v->clean(array('tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'name' => '', 'size' => 0, 'type' => ''));
+    $v->clean(['tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'name' => '', 'size' => 0, 'type' => '']);
     $t->fail('->clean() throws an sfValidatorError if the file is required and no file is uploaded');
     $t->skip();
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the file is required and no file is uploaded');
     $t->is($e->getCode(), 'required', '->clean() throws an error code of required');
 }
@@ -185,22 +186,22 @@ class myValidatedFile extends sfValidatedFile
     $v->clean(null);
     $t->fail('->clean() throws an sfValidatorError if the file is required and no file is uploaded');
     $t->skip();
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the file is required and no file is uploaded');
     $t->is($e->getCode(), 'required', '->clean() throws an error code of required');
 }
-$v = new testValidatorFile(array('required' => false));
-$t->is($v->clean(array('tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'name' => '', 'size' => 0, 'type' => '')), null, '->clean() handles the required option correctly');
+$v = new \testValidatorFile(['required' => false]);
+$t->is($v->clean(['tmp_name' => '', 'error' => UPLOAD_ERR_NO_FILE, 'name' => '', 'size' => 0, 'type' => '']), null, '->clean() handles the required option correctly');
 
 // sfValidatedFile
 
 // ->getOriginalName() ->getTempName() ->getSize() ->getType()
 $t->diag('->getOriginalName() ->getTempName() ->getSize() ->getType()');
-sfToolkit::clearDirectory($tmpDir.'/foo');
+\sfToolkit::clearDirectory($tmpDir.'/foo');
 if (is_dir($tmpDir.'/foo')) {
     rmdir($tmpDir.'/foo');
 }
-$f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getOriginalName(), 'test.txt', '->getOriginalName() returns the original name');
 $t->is($f->getTempName(), $tmpDir.'/test.txt', '->getTempName() returns the temp name');
 $t->is($f->getType(), 'text/plain', '->getType() returns the content type');
@@ -208,7 +209,7 @@ class myValidatedFile extends sfValidatedFile
 
 // ->save() ->isSaved() ->getSavedName()
 $t->diag('->save() ->isSaved() ->getSavedName()');
-$f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->isSaved(), false, '->isSaved() returns false if the file has not been saved');
 $t->is($f->getSavedName(), null, '->getSavedName() returns null if the file has not been saved');
 $filename = $f->save($tmpDir.'/foo/test1.txt');
@@ -217,7 +218,7 @@ class myValidatedFile extends sfValidatedFile
 $t->is($f->isSaved(), true, '->isSaved() returns true if the file has been saved');
 $t->is($f->getSavedName(), $tmpDir.'/foo/test1.txt', '->getSavedName() returns the saved file name');
 
-$f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content), $tmpDir);
+$f = new \sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content), $tmpDir);
 $filename = $f->save($tmpDir.'/foo/test1.txt');
 $t->is($filename, 'foo/test1.txt', '->save() returns the saved filename relative to the path given');
 $t->is(file_get_contents($tmpDir.'/foo/test1.txt'), file_get_contents($tmpDir.'/test.txt'), '->save() saves the file to the given path');
@@ -233,40 +234,40 @@ class myValidatedFile extends sfValidatedFile
 $t->is($f->getSavedName(), $tmpDir.'/'.$filename, '->getSavedName() returns the saved file name');
 
 try {
-    $f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
+    $f = new \sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
     $f->save();
     $t->fail('->save() throws an Exception if you don\'t give a filename and the path is empty');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->save() throws an Exception if you don\'t give a filename and the path is empty');
 }
 
 try {
     $f->save($tmpDir.'/test.txt/test1.txt');
     $t->fail('->save() throws an Exception if the directory already exists and is not a directory');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->pass('->save() throws an Exception if the directory already exists and is not a directory');
 }
 
 // ->getExtension()
 $t->diag('->getExtension()');
-$f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getExtension(), '.txt', '->getExtension() returns file extension based on the content type');
-$f = new sfValidatedFile('test.txt', 'image/x-png', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', 'image/x-png', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getExtension(), '.png', '->getExtension() returns file extension based on the content type');
-$f = new sfValidatedFile('test.txt', 'very/specific', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', 'very/specific', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getExtension(), '', '->getExtension() returns an empty string if it does not know the content type');
-$f = new sfValidatedFile('test.txt', '', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', '', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getExtension(), '', '->getExtension() returns an empty string if the content type is empty');
 $t->is($f->getExtension('bin'), 'bin', '->getExtension() takes a default extension as its first argument');
 
 // ->getOriginalExtension()
 $t->diag('->getOriginalExtension()');
-$f = new sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test.txt', 'text/plain', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getOriginalExtension(), '.txt', '->getOriginalExtension() returns the extension based on the uploaded file name');
-$f = new sfValidatedFile('test', 'text/plain', $tmpDir.'/test.txt', strlen($content));
+$f = new \sfValidatedFile('test', 'text/plain', $tmpDir.'/test.txt', strlen($content));
 $t->is($f->getOriginalExtension(), '', '->getOriginalExtension() returns an empty extension if the uploaded file name has no extension');
 $t->is($f->getOriginalExtension('bin'), 'bin', '->getOriginalExtension() takes a default extension as its first argument');
 
 unlink($tmpDir.'/test.txt');
-sfToolkit::clearDirectory($tmpDir.'/foo');
+\sfToolkit::clearDirectory($tmpDir.'/foo');
 rmdir($tmpDir.'/foo');
diff --git a/test/unit/validator/sfValidatorFromDescriptionTest.php b/test/unit/validator/sfValidatorFromDescriptionTest.php
index 3fc2c1f2f..033ccd849 100644
--- a/test/unit/validator/sfValidatorFromDescriptionTest.php
+++ b/test/unit/validator/sfValidatorFromDescriptionTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(98);
+$t = new \lime_test(98);
 
-$tests = array(
+$tests = [
     'Integer',
     'Integer()',
     'Integer({min: 18})',
@@ -105,20 +106,20 @@
     'email:Email and (age:Integer({min: 18}) or (age:Integer({max: 18}) and is_young:Boolean({required: true})))',
     '(password == password_bis) and begin_date <= end_date and password:String({min_length: 4, max_length: 18})',
     'countries:Choice({choices: [France, USA, Italy, Spain]}) and password ==({}, {invalid: "Passwords must be the same (%left_field% != %right_field%)"}) password_bis and begin_date <= end_date and password:String({min_length: 4, max_length: 18})',
-);
+];
 
 foreach ($tests as $test) {
-    $v = new sfValidatorFromDescription($test);
+    $v = new \sfValidatorFromDescription($test);
     $embedValidator = $v->getValidator();
 
     eval('$evaledValidator = '.$v->asPhp().';');
 
     $t->is($evaledValidator->asString(), $v->asString(), sprintf('sfValidatorFromDescription is able to parse "%s"', str_replace("\n", '\n', $test)));
 
-    $v1 = new sfValidatorFromDescription($embedValidator->asString());
+    $v1 = new \sfValidatorFromDescription($embedValidator->asString());
     $embedValidator1 = $v1->getValidator();
 
-    $v2 = new sfValidatorFromDescription($embedValidator1->asString());
+    $v2 = new \sfValidatorFromDescription($embedValidator1->asString());
 
     $t->is($v1->asString(), $v2->asString(), sprintf('sfValidatorFromDescription is able to parse "%s"', str_replace("\n", '\n', $test)));
 }
diff --git a/test/unit/validator/sfValidatorIntegerTest.php b/test/unit/validator/sfValidatorIntegerTest.php
index 2a90b23bc..c2ecb56d0 100644
--- a/test/unit/validator/sfValidatorIntegerTest.php
+++ b/test/unit/validator/sfValidatorIntegerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(15);
+$t = new \lime_test(15);
 
-$v = new sfValidatorInteger();
+$v = new \sfValidatorInteger();
 
 // ->clean()
 $t->diag('->clean()');
@@ -23,7 +24,7 @@
     $v->clean('not an integer');
     $t->fail('->clean() throws a sfValidatorError if the value is not an integer');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the value is not an integer');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -32,7 +33,7 @@
     $v->clean(12.3);
     $t->fail('->clean() throws a sfValidatorError if the value is not an integer');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the value is not an integer');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -47,7 +48,7 @@
     $v->clean(3);
     $t->fail('"max" option set the maximum number allowed');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"max" option set the maximum number allowed');
     $t->is($e->getCode(), 'max', '->clean() throws a sfValidatorError');
 }
@@ -57,7 +58,7 @@
 try {
     $v->clean(5);
     $t->fail('"max" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Too large', '"max" error message customization');
 }
 
@@ -70,7 +71,7 @@
     $v->clean('1');
     $t->fail('"min" option set the minimum number allowed');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"min" option set the minimum number allowed');
     $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
 }
@@ -80,7 +81,7 @@
 try {
     $v->clean(1);
     $t->fail('"min" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Too small', '"min" error message customization');
 }
 
diff --git a/test/unit/validator/sfValidatorIpTest.php b/test/unit/validator/sfValidatorIpTest.php
index ce2e9a163..29755c5de 100644
--- a/test/unit/validator/sfValidatorIpTest.php
+++ b/test/unit/validator/sfValidatorIpTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,7 +11,7 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$validV4Ips = array(
+$validV4Ips = [
     '0.0.0.0',
     '10.0.0.0',
     '123.45.67.178',
@@ -19,9 +20,9 @@
     '224.0.0.1',
     '255.255.255.255',
     '127.0.0.0',
-);
+];
 
-$invalidV4Ips = array(
+$invalidV4Ips = [
     '0',
     '0.0',
     '0.0.0',
@@ -31,21 +32,21 @@
     '0.0.0.256',
     '-1.0.0.0',
     'foobar',
-);
+];
 
-$invalidPrivateV4Ips = array(
+$invalidPrivateV4Ips = [
     '10.0.0.0',
     '172.16.0.0',
     '192.168.1.0',
-);
+];
 
-$invalidReservedV4Ips = array(
+$invalidReservedV4Ips = [
     '0.0.0.0',
     '240.0.0.1',
     '255.255.255.255',
-);
+];
 
-$validV6Ips = array(
+$validV6Ips = [
     '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
     '2001:0DB8:85A3:0000:0000:8A2E:0370:7334',
     '2001:0Db8:85a3:0000:0000:8A2e:0370:7334',
@@ -65,9 +66,9 @@
     '::0.0.0.0',
     '::255.255.255.255',
     '::123.45.67.178',
-);
+];
 
-$invalidV6Ips = array(
+$invalidV6Ips = [
     'z001:0db8:85a3:0000:0000:8a2e:0370:7334',
     'fe80',
     'fe80:8329',
@@ -81,25 +82,25 @@
     '::0.256.0.0',
     '::0.0.256.0',
     '::0.0.0.256',
-);
+];
 
-$invalidPrivateV6Ips = array(
+$invalidPrivateV6Ips = [
     'fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c',
     'fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c',
     'fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334',
-);
+];
 
-$t = new lime_test(180, new lime_output_color());
+$t = new \lime_test(180, new \lime_output_color());
 
 $t->diag('testing against empty IP');
 
-$v = new sfValidatorIp(array('required' => false));
+$v = new \sfValidatorIp(['required' => false]);
 
-foreach (array(null, '') as $ip) {
+foreach ([null, ''] as $ip) {
     try {
         $v->clean($ip);
         $t->pass('Empty IP is considered as valid');
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->fail('Empty IP is considered as valid');
     }
 }
@@ -109,19 +110,19 @@
     try {
         $v->clean($ip);
         $t->pass(sprintf('%s is considered as valid ip', $ip));
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->fail(sprintf('%s is considered as valid ip', $ip));
     }
 }
 
-foreach (array(sfValidatorIp::IP_V4 => $validV4Ips, sfValidatorIp::IP_V6 => $validV6Ips) as $version => $ips) {
+foreach ([\sfValidatorIp::IP_V4 => $validV4Ips, \sfValidatorIp::IP_V6 => $validV6Ips] as $version => $ips) {
     $t->diag('testing against valid IP V'.$version);
     $v->setOption('version', $version);
     foreach ($ips as $ip) {
         try {
             $v->clean($ip);
             $t->pass(sprintf('%s is considered as valid ip', $ip));
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $t->fail(sprintf('%s is considered as valid ip', $ip));
         }
     }
@@ -132,58 +133,58 @@
     try {
         $v->clean($ip);
         $t->fail(sprintf('%s is not considered as valid ip', $ip));
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass(sprintf('%s is not considered as valid ip', $ip));
     }
 }
 
-foreach (array(sfValidatorIp::IP_V4 => $invalidV4Ips, sfValidatorIp::IP_V6 => $invalidV6Ips) as $version => $ips) {
+foreach ([\sfValidatorIp::IP_V4 => $invalidV4Ips, \sfValidatorIp::IP_V6 => $invalidV6Ips] as $version => $ips) {
     $t->diag('testing against invalid IP V'.$version);
     $v->setOption('version', $version);
     foreach ($ips as $ip) {
         try {
             $v->clean($ip);
             $t->fail(sprintf('%s is not considered as valid ip', $ip));
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $t->pass(sprintf('%s is not considered as valid ip', $ip));
         }
     }
 }
 
-foreach (array(sfValidatorIp::IP_V4_NO_PRIV => $invalidPrivateV4Ips, sfValidatorIp::IP_V6_NO_PRIV => $invalidPrivateV6Ips) as $version => $ips) {
+foreach ([\sfValidatorIp::IP_V4_NO_PRIV => $invalidPrivateV4Ips, \sfValidatorIp::IP_V6_NO_PRIV => $invalidPrivateV6Ips] as $version => $ips) {
     $t->diag('testing against invalid IP V'.$version);
     $v->setOption('version', $version);
     foreach ($ips as $ip) {
         try {
             $v->clean($ip);
             $t->fail(sprintf('%s is not considered as valid ip', $ip));
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $t->pass(sprintf('%s is not considered as valid ip', $ip));
         }
     }
 }
 
-foreach (array(sfValidatorIp::IP_V4_NO_RES => $invalidReservedV4Ips, sfValidatorIp::IP_V6_NO_RES => $invalidV6Ips) as $version => $ips) {
+foreach ([\sfValidatorIp::IP_V4_NO_RES => $invalidReservedV4Ips, \sfValidatorIp::IP_V6_NO_RES => $invalidV6Ips] as $version => $ips) {
     $t->diag('testing against invalid IP V'.$version);
     $v->setOption('version', $version);
     foreach ($ips as $ip) {
         try {
             $v->clean($ip);
             $t->fail(sprintf('%s is not considered as valid ip', $ip));
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $t->pass(sprintf('%s is not considered as valid ip', $ip));
         }
     }
 }
 
-foreach (array(sfValidatorIp::IP_V4_ONLY_PUBLIC => array_merge($invalidReservedV4Ips, $invalidPrivateV4Ips), sfValidatorIp::IP_V6_ONLY_PUBLIC => array_merge($invalidPrivateV6Ips, $invalidV6Ips)) as $version => $ips) {
+foreach ([\sfValidatorIp::IP_V4_ONLY_PUBLIC => array_merge($invalidReservedV4Ips, $invalidPrivateV4Ips), \sfValidatorIp::IP_V6_ONLY_PUBLIC => array_merge($invalidPrivateV6Ips, $invalidV6Ips)] as $version => $ips) {
     $t->diag('testing against invalid IP V'.$version);
     $v->setOption('version', $version);
     foreach ($ips as $ip) {
         try {
             $v->clean($ip);
             $t->fail(sprintf('%s is not considered as valid ip', $ip));
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $t->pass(sprintf('%s is not considered as valid ip', $ip));
         }
     }
@@ -191,36 +192,36 @@
 
 $t->diag('testing against invalid private IP all');
 
-$v->setOption('version', sfValidatorIp::IP_ALL_NO_PRIV);
+$v->setOption('version', \sfValidatorIp::IP_ALL_NO_PRIV);
 foreach (array_merge($invalidPrivateV4Ips, $invalidPrivateV6Ips) as $ip) {
     try {
         $v->clean($ip);
         $t->fail(sprintf('%s is not considered as valid ip', $ip));
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass(sprintf('%s is not considered as valid ip', $ip));
     }
 }
 
 $t->diag('testing against invalid reserved IP all');
 
-$v->setOption('version', sfValidatorIp::IP_ALL_NO_RES);
+$v->setOption('version', \sfValidatorIp::IP_ALL_NO_RES);
 foreach (array_merge($invalidReservedV4Ips, $invalidV6Ips) as $ip) {
     try {
         $v->clean($ip);
         $t->fail(sprintf('%s is not considered as valid ip', $ip));
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass(sprintf('%s is not considered as valid ip', $ip));
     }
 }
 
 $t->diag('testing against invalid public IP all');
 
-$v->setOption('version', sfValidatorIp::IP_ALL_ONLY_PUBLIC);
+$v->setOption('version', \sfValidatorIp::IP_ALL_ONLY_PUBLIC);
 foreach (array_merge($invalidReservedV4Ips, $invalidV6Ips, $invalidPrivateV4Ips, $invalidPrivateV6Ips) as $ip) {
     try {
         $v->clean($ip);
         $t->fail(sprintf('%s is not considered as valid ip', $ip));
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass(sprintf('%s is not considered as valid ip', $ip));
     }
 }
diff --git a/test/unit/validator/sfValidatorNumberTest.php b/test/unit/validator/sfValidatorNumberTest.php
index 509d1292c..49af4782d 100644
--- a/test/unit/validator/sfValidatorNumberTest.php
+++ b/test/unit/validator/sfValidatorNumberTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(13);
+$t = new \lime_test(13);
 
-$v = new sfValidatorNumber();
+$v = new \sfValidatorNumber();
 
 // ->clean()
 $t->diag('->clean()');
@@ -25,7 +26,7 @@
 try {
     $v->clean('not a float');
     $t->fail('->clean() throws a sfValidatorError if the value is not a number');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the value is not a number');
 }
 
@@ -38,7 +39,7 @@
 try {
     $v->clean(3.4);
     $t->fail('"max" option set the maximum number allowed');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"max" option set the maximum number allowed');
 }
 
@@ -47,7 +48,7 @@
 try {
     $v->clean(5);
     $t->fail('"max" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Too large', '"max" error message customization');
 }
 
@@ -60,7 +61,7 @@
     $v->clean('1');
     $t->fail('"min" option set the minimum number allowed');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"min" option set the minimum number allowed');
     $t->is($e->getCode(), 'min', '->clean() throws a sfValidatorError');
 }
@@ -70,7 +71,7 @@
 try {
     $v->clean(1);
     $t->fail('"min" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Too small', '"min" error message customization');
 }
 
diff --git a/test/unit/validator/sfValidatorOrTest.php b/test/unit/validator/sfValidatorOrTest.php
index 42c9a066b..92b494927 100644
--- a/test/unit/validator/sfValidatorOrTest.php
+++ b/test/unit/validator/sfValidatorOrTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,35 +11,35 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(18);
+$t = new \lime_test(18);
 
-$v1 = new sfValidatorString(array('max_length' => 3));
-$v2 = new sfValidatorString(array('min_length' => 3));
+$v1 = new \sfValidatorString(['max_length' => 3]);
+$v2 = new \sfValidatorString(['min_length' => 3]);
 
-$v = new sfValidatorOr(array($v1, $v2));
+$v = new \sfValidatorOr([$v1, $v2]);
 
 // __construct()
 $t->diag('__construct()');
-$v = new sfValidatorOr();
-$t->is($v->getValidators(), array(), '->__construct() can take no argument');
-$v = new sfValidatorOr($v1);
-$t->is($v->getValidators(), array($v1), '->__construct() can take a validator as its first argument');
-$v = new sfValidatorOr(array($v1, $v2));
-$t->is($v->getValidators(), array($v1, $v2), '->__construct() can take an array of validators as its first argument');
+$v = new \sfValidatorOr();
+$t->is($v->getValidators(), [], '->__construct() can take no argument');
+$v = new \sfValidatorOr($v1);
+$t->is($v->getValidators(), [$v1], '->__construct() can take a validator as its first argument');
+$v = new \sfValidatorOr([$v1, $v2]);
+$t->is($v->getValidators(), [$v1, $v2], '->__construct() can take an array of validators as its first argument');
 
 try {
-    $v = new sfValidatorOr('string');
+    $v = new \sfValidatorOr('string');
     $t->fail('_construct() throws an exception when passing a non supported first argument');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('_construct() throws an exception when passing a non supported first argument');
 }
 
 // ->addValidator()
 $t->diag('->addValidator()');
-$v = new sfValidatorOr();
+$v = new \sfValidatorOr();
 $v->addValidator($v1);
 $v->addValidator($v2);
-$t->is($v->getValidators(), array($v1, $v2), '->addValidator() adds a validator');
+$t->is($v->getValidators(), [$v1, $v2], '->addValidator() adds a validator');
 
 // ->clean()
 $t->diag('->clean()');
@@ -49,7 +50,7 @@
     $v->clean(null);
     $t->fail('->clean() throws an sfValidatorError exception if the input value is required');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if the input value is required');
     $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
 }
@@ -61,11 +62,11 @@
     $v->clean('foo');
     $t->fail('->clean() throws an sfValidatorError exception if all the validators fails');
     $t->skip('', 3);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if all the validators fails');
     $t->is(count($e), 2, '->clean() throws an exception with all error messages');
     $t->is($e[0]->getCode(), 'max_length', '->clean() throws a sfValidatorSchemaError');
-    $t->ok($e instanceof sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
+    $t->ok($e instanceof \sfValidatorErrorSchema, '->clean() throws a sfValidatorSchemaError');
 }
 
 try {
@@ -73,10 +74,10 @@
     $v->clean('foo');
     $t->fail('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->skip('', 2);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError exception if one of the validators fails');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError if invalid message is not empty');
-    $t->ok(!$e instanceof sfValidatorErrorSchema, '->clean() throws a sfValidatorError if invalid message is not empty');
+    $t->ok(!$e instanceof \sfValidatorErrorSchema, '->clean() throws a sfValidatorError if invalid message is not empty');
 }
 
 $v1->setOption('max_length', 3);
@@ -85,10 +86,10 @@
 
 // ->asString()
 $t->diag('->asString()');
-$v1 = new sfValidatorString(array('max_length' => 3));
-$v2 = new sfValidatorString(array('min_length' => 3));
-$v = new sfValidatorOr(array($v1, $v2));
+$v1 = new \sfValidatorString(['max_length' => 3]);
+$v2 = new \sfValidatorString(['min_length' => 3]);
+$v = new \sfValidatorOr([$v1, $v2]);
 $t->is($v->asString(), "(\n  String({ max_length: 3 })\n  or\n  String({ min_length: 3 })\n)", '->asString() returns a string representation of the validator');
 
-$v = new sfValidatorOr(array($v1, $v2), array(), array('required' => 'This is required.'));
+$v = new \sfValidatorOr([$v1, $v2], [], ['required' => 'This is required.']);
 $t->is($v->asString(), "(\n  String({ max_length: 3 })\n  or({}, { required: 'This is required.' })\n  String({ min_length: 3 })\n)", '->asString() returns a string representation of the validator');
diff --git a/test/unit/validator/sfValidatorPassTest.php b/test/unit/validator/sfValidatorPassTest.php
index 64a290b7c..59fea40fd 100644
--- a/test/unit/validator/sfValidatorPassTest.php
+++ b/test/unit/validator/sfValidatorPassTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$v = new sfValidatorPass();
+$v = new \sfValidatorPass();
 
 // ->clean()
 $t->diag('->clean()');
diff --git a/test/unit/validator/sfValidatorRegexTest.php b/test/unit/validator/sfValidatorRegexTest.php
index 80e5bc475..48e5e8394 100644
--- a/test/unit/validator/sfValidatorRegexTest.php
+++ b/test/unit/validator/sfValidatorRegexTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,64 +16,64 @@ function generate_regex()
     return '/^123$/';
 }
 
-$t = new lime_test(11);
+$t = new \lime_test(11);
 
 // __construct()
 $t->diag('__construct()');
 
 try {
-    new sfValidatorRegex();
+    new \sfValidatorRegex();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a pattern option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a pattern option');
 }
 
 // ->clean()
 $t->diag('->clean()');
 
-$v = new sfValidatorRegex(array('pattern' => '/^[0-9]+$/'));
+$v = new \sfValidatorRegex(['pattern' => '/^[0-9]+$/']);
 $t->is($v->clean(12), '12', '->clean() checks that the value match the regex');
 
 try {
     $v->clean('symfony');
     $t->fail('->clean() throws an sfValidatorError if the value does not match the pattern');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the value does not match the pattern');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
-$v = new sfValidatorRegex(array('pattern' => '/^[0-9]+$/', 'must_match' => false));
+$v = new \sfValidatorRegex(['pattern' => '/^[0-9]+$/', 'must_match' => false]);
 $t->is($v->clean('symfony'), 'symfony', '->clean() checks that the value does not match the regex if must_match is false');
 
 try {
     $v->clean(12);
     $t->fail('->clean() throws an sfValidatorError if the value matches the pattern if must_match is false');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws an sfValidatorError if the value matches the pattern if must_match is false');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
-$v = new sfValidatorRegex(array('pattern' => new sfCallable('generate_regex')));
+$v = new \sfValidatorRegex(['pattern' => new \sfCallable('generate_regex')]);
 
 try {
     $v->clean('123');
     $t->pass('->clean() uses the pattern returned by a sfCallable pattern option');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->fail('->clean() uses the pattern returned by a sfCallable pattern option');
 }
 
 // ->asString()
 $t->diag('->asString()');
 
-$v = new sfValidatorRegex(array('pattern' => '/^[0-9]+$/', 'must_match' => false));
+$v = new \sfValidatorRegex(['pattern' => '/^[0-9]+$/', 'must_match' => false]);
 $t->is($v->asString(), 'Regex({ must_match: false, pattern: \'/^[0-9]+$/\' })', '->asString() returns a string representation of the validator');
 
 // ->getPattern()
 $t->diag('->getPattern()');
 
-$v = new sfValidatorRegex(array('pattern' => '/\w+/'));
+$v = new \sfValidatorRegex(['pattern' => '/\w+/']);
 $t->is($v->getPattern(), '/\w+/', '->getPattern() returns the regular expression');
-$v = new sfValidatorRegex(array('pattern' => new sfCallable('generate_regex')));
+$v = new \sfValidatorRegex(['pattern' => new \sfCallable('generate_regex')]);
 $t->is($v->getPattern(), '/^123$/', '->getPattern() returns a regular expression from a sfCallable');
diff --git a/test/unit/validator/sfValidatorSchemaCompareTest.php b/test/unit/validator/sfValidatorSchemaCompareTest.php
index 04f8e3e80..b12ee585f 100644
--- a/test/unit/validator/sfValidatorSchemaCompareTest.php
+++ b/test/unit/validator/sfValidatorSchemaCompareTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,76 +11,76 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(114);
+$t = new \lime_test(114);
 
-$v = new sfValidatorSchemaCompare('left', sfValidatorSchemaCompare::EQUAL, 'right');
+$v = new \sfValidatorSchemaCompare('left', \sfValidatorSchemaCompare::EQUAL, 'right');
 
 // ->clean()
 $t->diag('->clean()');
-foreach (array(
-    array(array('left' => 'foo', 'right' => 'foo'), sfValidatorSchemaCompare::EQUAL),
-    array(array(), sfValidatorSchemaCompare::EQUAL),
-    array(null, sfValidatorSchemaCompare::EQUAL),
-    array(array('left' => 1, 'right' => 2), sfValidatorSchemaCompare::LESS_THAN),
-    array(array('left' => 2, 'right' => 2), sfValidatorSchemaCompare::LESS_THAN_EQUAL),
-    array(array('left' => 2, 'right' => 1), sfValidatorSchemaCompare::GREATER_THAN),
-    array(array('left' => 2, 'right' => 2), sfValidatorSchemaCompare::GREATER_THAN_EQUAL),
-    array(array('left' => 'foo', 'right' => 'bar'), sfValidatorSchemaCompare::NOT_EQUAL),
-    array(array('left' => '0000', 'right' => '0'), sfValidatorSchemaCompare::NOT_IDENTICAL),
-    array(array('left' => '0000', 'right' => '0'), sfValidatorSchemaCompare::EQUAL),
-    array(array('left' => '0000', 'right' => '0000'), sfValidatorSchemaCompare::IDENTICAL),
+foreach ([
+    [['left' => 'foo', 'right' => 'foo'], \sfValidatorSchemaCompare::EQUAL],
+    [[], \sfValidatorSchemaCompare::EQUAL],
+    [null, \sfValidatorSchemaCompare::EQUAL],
+    [['left' => 1, 'right' => 2], \sfValidatorSchemaCompare::LESS_THAN],
+    [['left' => 2, 'right' => 2], \sfValidatorSchemaCompare::LESS_THAN_EQUAL],
+    [['left' => 2, 'right' => 1], \sfValidatorSchemaCompare::GREATER_THAN],
+    [['left' => 2, 'right' => 2], \sfValidatorSchemaCompare::GREATER_THAN_EQUAL],
+    [['left' => 'foo', 'right' => 'bar'], \sfValidatorSchemaCompare::NOT_EQUAL],
+    [['left' => '0000', 'right' => '0'], \sfValidatorSchemaCompare::NOT_IDENTICAL],
+    [['left' => '0000', 'right' => '0'], \sfValidatorSchemaCompare::EQUAL],
+    [['left' => '0000', 'right' => '0000'], \sfValidatorSchemaCompare::IDENTICAL],
 
-    array(array('left' => 'foo', 'right' => 'foo'), '=='),
-    array(array(), '=='),
-    array(null, '=='),
-    array(array('left' => 1, 'right' => 2), '<'),
-    array(array('left' => 2, 'right' => 2), '<='),
-    array(array('left' => 2, 'right' => 1), '>'),
-    array(array('left' => 2, 'right' => 2), '>='),
-    array(array('left' => 'foo', 'right' => 'bar'), '!='),
-    array(array('left' => '0000', 'right' => '0'), '!=='),
-    array(array('left' => '0000', 'right' => '0'), '=='),
-    array(array('left' => '0000', 'right' => '0000'), '==='),
-) as $values) {
+    [['left' => 'foo', 'right' => 'foo'], '=='],
+    [[], '=='],
+    [null, '=='],
+    [['left' => 1, 'right' => 2], '<'],
+    [['left' => 2, 'right' => 2], '<='],
+    [['left' => 2, 'right' => 1], '>'],
+    [['left' => 2, 'right' => 2], '>='],
+    [['left' => 'foo', 'right' => 'bar'], '!='],
+    [['left' => '0000', 'right' => '0'], '!=='],
+    [['left' => '0000', 'right' => '0'], '=='],
+    [['left' => '0000', 'right' => '0000'], '==='],
+] as $values) {
     $v->setOption('operator', $values[1]);
     $t->is($v->clean($values[0]), $values[0], '->clean() checks that the values match the comparison');
 }
 
-foreach (array(
-    array(array('left' => 'foo', 'right' => 'foo'), sfValidatorSchemaCompare::NOT_EQUAL),
-    array(array(), sfValidatorSchemaCompare::NOT_EQUAL),
-    array(null, sfValidatorSchemaCompare::NOT_EQUAL),
-    array(array('left' => 1, 'right' => 2), sfValidatorSchemaCompare::GREATER_THAN),
-    array(array('left' => 2, 'right' => 3), sfValidatorSchemaCompare::GREATER_THAN_EQUAL),
-    array(array('left' => 2, 'right' => 1), sfValidatorSchemaCompare::LESS_THAN),
-    array(array('left' => 3, 'right' => 2), sfValidatorSchemaCompare::LESS_THAN_EQUAL),
-    array(array('left' => 'foo', 'right' => 'bar'), sfValidatorSchemaCompare::EQUAL),
-    array(array('left' => '0000', 'right' => '0'), sfValidatorSchemaCompare::IDENTICAL),
-    array(array('left' => '0000', 'right' => '0'), sfValidatorSchemaCompare::NOT_EQUAL),
-    array(array('left' => '0000', 'right' => '0000'), sfValidatorSchemaCompare::NOT_IDENTICAL),
+foreach ([
+    [['left' => 'foo', 'right' => 'foo'], \sfValidatorSchemaCompare::NOT_EQUAL],
+    [[], \sfValidatorSchemaCompare::NOT_EQUAL],
+    [null, \sfValidatorSchemaCompare::NOT_EQUAL],
+    [['left' => 1, 'right' => 2], \sfValidatorSchemaCompare::GREATER_THAN],
+    [['left' => 2, 'right' => 3], \sfValidatorSchemaCompare::GREATER_THAN_EQUAL],
+    [['left' => 2, 'right' => 1], \sfValidatorSchemaCompare::LESS_THAN],
+    [['left' => 3, 'right' => 2], \sfValidatorSchemaCompare::LESS_THAN_EQUAL],
+    [['left' => 'foo', 'right' => 'bar'], \sfValidatorSchemaCompare::EQUAL],
+    [['left' => '0000', 'right' => '0'], \sfValidatorSchemaCompare::IDENTICAL],
+    [['left' => '0000', 'right' => '0'], \sfValidatorSchemaCompare::NOT_EQUAL],
+    [['left' => '0000', 'right' => '0000'], \sfValidatorSchemaCompare::NOT_IDENTICAL],
 
-    array(array('left' => 'foo', 'right' => 'foo'), '!='),
-    array(array(), '!='),
-    array(null, '!='),
-    array(array('left' => 1, 'right' => 2), '>'),
-    array(array('left' => 2, 'right' => 3), '>='),
-    array(array('left' => 2, 'right' => 1), '<'),
-    array(array('left' => 3, 'right' => 2), '<='),
-    array(array('left' => 'foo', 'right' => 'bar'), '=='),
-    array(array('left' => '0000', 'right' => '0'), '==='),
-    array(array('left' => '0000', 'right' => '0'), '!='),
-    array(array('left' => '0000', 'right' => '0000'), '!=='),
-) as $values) {
+    [['left' => 'foo', 'right' => 'foo'], '!='],
+    [[], '!='],
+    [null, '!='],
+    [['left' => 1, 'right' => 2], '>'],
+    [['left' => 2, 'right' => 3], '>='],
+    [['left' => 2, 'right' => 1], '<'],
+    [['left' => 3, 'right' => 2], '<='],
+    [['left' => 'foo', 'right' => 'bar'], '=='],
+    [['left' => '0000', 'right' => '0'], '==='],
+    [['left' => '0000', 'right' => '0'], '!='],
+    [['left' => '0000', 'right' => '0000'], '!=='],
+] as $values) {
     $v->setOption('operator', $values[1]);
 
-    foreach (array(true, false) as $globalError) {
+    foreach ([true, false] as $globalError) {
         $v->setOption('throw_global_error', $globalError);
 
         try {
             $v->clean($values[0]);
             $t->fail('->clean() throws an sfValidatorError if the value is the comparison failed');
             $t->skip('', 1);
-        } catch (sfValidatorError $e) {
+        } catch (\sfValidatorError $e) {
             $t->pass('->clean() throws an sfValidatorError if the value is the comparison failed');
             $t->is($e->getCode(), $globalError ? 'invalid' : 'left [invalid]', '->clean() throws a sfValidatorError');
         }
@@ -89,23 +90,23 @@
 try {
     $v->clean('foo');
     $t->fail('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
 }
 
-$v = new sfValidatorSchemaCompare('left', 'foo', 'right');
+$v = new \sfValidatorSchemaCompare('left', 'foo', 'right');
 
 try {
-    $v->clean(array());
+    $v->clean([]);
     $t->fail('->clean() throws an InvalidArgumentException exception if the operator does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->clean() throws an InvalidArgumentException exception if the operator does not exist');
 }
 
 // ->asString()
 $t->diag('->asString()');
-$v = new sfValidatorSchemaCompare('left', sfValidatorSchemaCompare::EQUAL, 'right');
+$v = new \sfValidatorSchemaCompare('left', \sfValidatorSchemaCompare::EQUAL, 'right');
 $t->is($v->asString(), 'left == right', '->asString() returns a string representation of the validator');
 
-$v = new sfValidatorSchemaCompare('left', sfValidatorSchemaCompare::EQUAL, 'right', array(), array('required' => 'This is required.'));
+$v = new \sfValidatorSchemaCompare('left', \sfValidatorSchemaCompare::EQUAL, 'right', [], ['required' => 'This is required.']);
 $t->is($v->asString(), 'left ==({}, { required: \'This is required.\' }) right', '->asString() returns a string representation of the validator');
diff --git a/test/unit/validator/sfValidatorSchemaFilterTest.php b/test/unit/validator/sfValidatorSchemaFilterTest.php
index 87bb1e5d9..e1ecacad4 100644
--- a/test/unit/validator/sfValidatorSchemaFilterTest.php
+++ b/test/unit/validator/sfValidatorSchemaFilterTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,20 +11,20 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
-$v1 = new sfValidatorString(array('min_length' => 2, 'trim' => true));
+$v1 = new \sfValidatorString(['min_length' => 2, 'trim' => true]);
 
-$v = new sfValidatorSchemaFilter('first_name', $v1);
+$v = new \sfValidatorSchemaFilter('first_name', $v1);
 
 // ->clean()
 $t->diag('->clean()');
-$t->is($v->clean(array('first_name' => '  foo  ')), array('first_name' => 'foo'), '->clean() executes the embedded validator');
+$t->is($v->clean(['first_name' => '  foo  ']), ['first_name' => 'foo'], '->clean() executes the embedded validator');
 
 try {
     $v->clean('string');
     $t->fail('->clean() throws a InvalidArgumentException if the input value is not an array');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->clean() throws a InvalidArgumentException if the input value is not an array');
 }
 
@@ -31,16 +32,16 @@
     $v->clean(null);
     $t->fail('->clean() throws a sfValidatorError if the embedded validator failed');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the embedded validator failed');
     $t->is($e->getCode(), 'first_name [required]', '->clean() throws a sfValidatorError');
 }
 
 try {
-    $v->clean(array('first_name' => 'f'));
+    $v->clean(['first_name' => 'f']);
     $t->fail('->clean() throws a sfValidatorError if the embedded validator failed');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the embedded validator failed');
     $t->is($e->getCode(), 'first_name [min_length]', '->clean() throws a sfValidatorError');
 }
diff --git a/test/unit/validator/sfValidatorSchemaTest.php b/test/unit/validator/sfValidatorSchemaTest.php
index dd8d0610b..56f826978 100644
--- a/test/unit/validator/sfValidatorSchemaTest.php
+++ b/test/unit/validator/sfValidatorSchemaTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,21 +11,21 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(94);
+$t = new \lime_test(94);
 
-class PreValidator extends sfValidatorBase
+class PreValidator extends \sfValidatorBase
 {
     protected function doClean($values)
     {
         if (isset($values['s1'], $values['s2'])) {
-            throw new sfValidatorError($this, 's1_or_s2', array('value' => $values));
+            throw new \sfValidatorError($this, 's1_or_s2', ['value' => $values]);
         }
 
         return array_map('strtoupper', $values);
     }
 }
 
-class PostValidator extends sfValidatorBase
+class PostValidator extends \sfValidatorBase
 {
     protected function doClean($values)
     {
@@ -36,17 +37,17 @@ protected function doClean($values)
     }
 }
 
-class Post1Validator extends sfValidatorBase
+class Post1Validator extends \sfValidatorBase
 {
     protected function doClean($values)
     {
         if ($values['s1'] == $values['s2']) {
-            throw new sfValidatorError($this, 's1_not_equal_s2', array('value' => $values));
+            throw new \sfValidatorError($this, 's1_not_equal_s2', ['value' => $values]);
         }
     }
 }
 
-class BytesValidatorSchema extends sfValidatorSchema
+class BytesValidatorSchema extends \sfValidatorSchema
 {
     public function getBytes($value)
     {
@@ -54,57 +55,57 @@ public function getBytes($value)
     }
 }
 
-$v1 = new sfValidatorString(array('max_length' => 3));
-$v2 = new sfValidatorString(array('min_length' => 3));
+$v1 = new \sfValidatorString(['max_length' => 3]);
+$v2 = new \sfValidatorString(['min_length' => 3]);
 
 // __construct()
 $t->diag('__construct()');
-$v = new sfValidatorSchema();
-$t->is($v->getFields(), array(), '->__construct() can take no argument');
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
-$t->is($v->getFields(), array('s1' => $v1, 's2' => $v2), '->__construct() can take an array of named sfValidator objects');
+$v = new \sfValidatorSchema();
+$t->is($v->getFields(), [], '->__construct() can take no argument');
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
+$t->is($v->getFields(), ['s1' => $v1, 's2' => $v2], '->__construct() can take an array of named sfValidator objects');
 
 try {
-    $v = new sfValidatorSchema('string');
+    $v = new \sfValidatorSchema('string');
     $t->fail('__construct() throws an InvalidArgumentException when passing a non supported first argument');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException when passing a non supported first argument');
 }
 
 // implements ArrayAccess
 $t->diag('implements ArrayAccess');
-$v = new sfValidatorSchema();
+$v = new \sfValidatorSchema();
 $v['s1'] = $v1;
 $v['s2'] = $v2;
-$t->is($v->getFields(), array('s1' => $v1, 's2' => $v2), 'sfValidatorSchema implements the ArrayAccess interface for the fields');
+$t->is($v->getFields(), ['s1' => $v1, 's2' => $v2], 'sfValidatorSchema implements the ArrayAccess interface for the fields');
 
 try {
     $v['v1'] = 'string';
     $t->fail('sfValidatorSchema implements the ArrayAccess interface for the fields');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('sfValidatorSchema implements the ArrayAccess interface for the fields');
 }
 
-$v = new sfValidatorSchema(array('s1' => $v1));
+$v = new \sfValidatorSchema(['s1' => $v1]);
 $t->is(isset($v['s1']), true, 'sfValidatorSchema implements the ArrayAccess interface for the fields');
 $t->is(isset($v['s2']), false, 'sfValidatorSchema implements the ArrayAccess interface for the fields');
 
-$v = new sfValidatorSchema(array('s1' => $v1));
+$v = new \sfValidatorSchema(['s1' => $v1]);
 $t->ok($v['s1'] == $v1, 'sfValidatorSchema implements the ArrayAccess interface for the fields');
 $t->is($v['s2'], null, 'sfValidatorSchema implements the ArrayAccess interface for the fields');
 
-$v = new sfValidatorSchema(array('v1' => $v1));
+$v = new \sfValidatorSchema(['v1' => $v1]);
 unset($v['s1']);
 $t->is($v['s1'], null, 'sfValidatorSchema implements the ArrayAccess interface for the fields');
 
 // ->configure()
 $t->diag('->configure()');
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
 $t->is($v->getOption('allow_extra_fields'), false, '->configure() sets "allow_extra_fields" option to false by default');
 $t->is($v->getOption('filter_extra_fields'), true, '->configure() sets "filter_extra_fields" option to true by default');
 $t->is($v->getMessage('extra_fields'), 'Unexpected extra form field named "%field%".', '->configure() has a default error message for the "extra_fields" error');
 
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2), array('allow_extra_fields' => true, 'filter_extra_fields' => false), array('extra_fields' => 'Extra fields'));
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2], ['allow_extra_fields' => true, 'filter_extra_fields' => false], ['extra_fields' => 'Extra fields']);
 $t->is($v->getOption('allow_extra_fields'), true, '->__construct() can override the default value for the "allow_extra_fields" option');
 $t->is($v->getOption('filter_extra_fields'), false, '->__construct() can override the default value for the "filter_extra_fields" option');
 
@@ -113,25 +114,25 @@ public function getBytes($value)
 // ->clean()
 $t->diag('->clean()');
 
-$v = new sfValidatorSchema();
-$t->is($v->clean(null), array(), '->clean() converts null to empty array before validation');
+$v = new \sfValidatorSchema();
+$t->is($v->clean(null), [], '->clean() converts null to empty array before validation');
 
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
 
 try {
     $v->clean('foo');
     $t->fail('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->clean() throws an InvalidArgumentException exception if the first argument is not an array of value');
 }
 
-$t->is($v->clean(array('s1' => 'foo', 's2' => 'bar')), array('s1' => 'foo', 's2' => 'bar'), '->clean() returns the string unmodified');
+$t->is($v->clean(['s1' => 'foo', 's2' => 'bar']), ['s1' => 'foo', 's2' => 'bar'], '->clean() returns the string unmodified');
 
 try {
-    $v->clean(array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'));
+    $v->clean(['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar']);
     $t->fail('->clean() throws an sfValidatorErrorSchema exception if a you give a non existant field');
     $t->skip('', 2);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->pass('->clean() throws an sfValidatorErrorSchema exception if a you give a non existant field');
     $t->is(count($e), 1, '->clean() throws an exception with all error messages');
     $t->is($e[0]->getCode(), 'extra_fields', '->clean() throws an exception with all error messages');
@@ -140,10 +141,10 @@ public function getBytes($value)
 $t->diag('required fields');
 
 try {
-    $v->clean(array('s1' => 'foo'));
+    $v->clean(['s1' => 'foo']);
     $t->fail('->clean() throws an sfValidatorErrorSchema exception if a required field is not provided');
     $t->skip('', 2);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->pass('->clean() throws an sfValidatorErrorSchema exception if a required field is not provided');
     $t->is(count($e), 1, '->clean() throws an exception with all error messages');
     $t->is($e['s2']->getCode(), 'required', '->clean() throws an exception with all error messages');
@@ -151,76 +152,76 @@ public function getBytes($value)
 
 // ->getPreValidator() ->setPreValidator()
 $t->diag('->getPreValidator() ->setPreValidator()');
-$v1 = new sfValidatorString(array('max_length' => 3, 'required' => false));
-$v2 = new sfValidatorString(array('min_length' => 3, 'required' => false));
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
-$v->setPreValidator($preValidator = new PreValidator());
+$v1 = new \sfValidatorString(['max_length' => 3, 'required' => false]);
+$v2 = new \sfValidatorString(['min_length' => 3, 'required' => false]);
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
+$v->setPreValidator($preValidator = new \PreValidator());
 $t->ok($v->getPreValidator() == $preValidator, '->getPreValidator() returns the current pre validator');
 
 try {
-    $v->clean(array('s1' => 'foo', 's2' => 'bar'));
+    $v->clean(['s1' => 'foo', 's2' => 'bar']);
     $t->fail('->clean() throws an sfValidatorErrorSchema exception if a pre-validator fails');
     $t->skip('', 2);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->pass('->clean() throws an sfValidatorErrorSchema exception if a pre-validator fails');
     $t->is(count($e), 1, '->clean() throws an exception with all error messages');
     $t->is($e[0]->getCode(), 's1_or_s2', '->clean() throws an exception with all error messages');
 }
 
-$s = $v->clean(array('s1' => 'foo'));
+$s = $v->clean(['s1' => 'foo']);
 $t->is('FOO', $s['s1'], '->clean() takes values returned by pre-validator');
 
 // ->getPostValidator() ->setPostValidator()
 $t->diag('->getPostValidator() ->setPostValidator()');
-$v1 = new sfValidatorString(array('max_length' => 3, 'required' => false));
-$v2 = new sfValidatorString(array('min_length' => 3, 'required' => false));
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
-$v->setPostValidator($postValidator = new PostValidator());
+$v1 = new \sfValidatorString(['max_length' => 3, 'required' => false]);
+$v2 = new \sfValidatorString(['min_length' => 3, 'required' => false]);
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
+$v->setPostValidator($postValidator = new \PostValidator());
 $t->ok($v->getPostValidator() == $postValidator, '->getPostValidator() returns the current post validator');
-$t->is($v->clean(array('s1' => 'foo', 's2' => 'bar')), array('s1' => '*foo*', 's2' => '*bar*'), '->clean() executes post validators');
+$t->is($v->clean(['s1' => 'foo', 's2' => 'bar']), ['s1' => '*foo*', 's2' => '*bar*'], '->clean() executes post validators');
 
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
-$v->setPostValidator(new Post1Validator());
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
+$v->setPostValidator(new \Post1Validator());
 
 try {
-    $v->clean(array('s1' => 'foo', 's2' => 'foo'));
+    $v->clean(['s1' => 'foo', 's2' => 'foo']);
     $t->fail('->clean() throws an sfValidatorErrorSchema exception if a post-validator fails');
     $t->skip('', 2);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->pass('->clean() throws an sfValidatorErrorSchema exception if a post-validator fails');
     $t->is(count($e), 1, '->clean() throws an exception with all error messages');
     $t->is($e[0]->getCode(), 's1_not_equal_s2', '->clean() throws an exception with all error messages');
 }
 
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
-$t->is($v->clean(array('s1' => 'foo')), array('s1' => 'foo', 's2' => null), '->clean() returns null values for fields not present in the input array');
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
+$t->is($v->clean(['s1' => 'foo']), ['s1' => 'foo', 's2' => null], '->clean() returns null values for fields not present in the input array');
 
 $t->diag('extra fields');
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2));
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2]);
 $v->setOption('allow_extra_fields', true);
-$ret = $v->clean(array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'));
-$t->is($ret, array('s1' => 'foo', 's2' => 'bar'), '->clean() filters non existant fields if "allow_extra_fields" is true');
+$ret = $v->clean(['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar']);
+$t->is($ret, ['s1' => 'foo', 's2' => 'bar'], '->clean() filters non existant fields if "allow_extra_fields" is true');
 
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2), array('allow_extra_fields' => true));
-$ret = $v->clean(array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'));
-$t->is($ret, array('s1' => 'foo', 's2' => 'bar'), '->clean() filters non existant fields if "allow_extra_fields" is true');
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2], ['allow_extra_fields' => true]);
+$ret = $v->clean(['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar']);
+$t->is($ret, ['s1' => 'foo', 's2' => 'bar'], '->clean() filters non existant fields if "allow_extra_fields" is true');
 
-$v = new sfValidatorSchema(array('s1' => $v1, 's2' => $v2), array('allow_extra_fields' => true, 'filter_extra_fields' => false));
-$ret = $v->clean(array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'));
-$t->is($ret, array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'), '->clean() do not filter non existant fields if "filter_extra_fields" is false');
+$v = new \sfValidatorSchema(['s1' => $v1, 's2' => $v2], ['allow_extra_fields' => true, 'filter_extra_fields' => false]);
+$ret = $v->clean(['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar']);
+$t->is($ret, ['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'], '->clean() do not filter non existant fields if "filter_extra_fields" is false');
 
 $v->setOption('filter_extra_fields', false);
-$ret = $v->clean(array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'));
-$t->is($ret, array('s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'), '->clean() do not filter non existant fields if "filter_extra_fields" is false');
+$ret = $v->clean(['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar']);
+$t->is($ret, ['s1' => 'foo', 's2' => 'bar', 'foo' => 'bar'], '->clean() do not filter non existant fields if "filter_extra_fields" is false');
 
 $t->diag('one validator fails');
 $v['s2']->setOption('max_length', 2);
 
 try {
-    $v->clean(array('s1' => 'foo', 's2' => 'bar'));
+    $v->clean(['s1' => 'foo', 's2' => 'bar']);
     $t->fail('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
     $t->skip('', 2);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->pass('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
     $t->is(count($e), 1, '->clean() throws an exception with all error messages');
     $t->is($e['s2']->getCode(), 'max_length', '->clean() throws an exception with all error messages');
@@ -231,10 +232,10 @@ public function getBytes($value)
 $v['s2']->setOption('max_length', 2);
 
 try {
-    $v->clean(array('s1' => 'foo', 's2' => 'bar'));
+    $v->clean(['s1' => 'foo', 's2' => 'bar']);
     $t->fail('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
     $t->skip('', 3);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->pass('->clean() throws an sfValidatorErrorSchema exception if one of the validators fails');
     $t->is(count($e), 2, '->clean() throws an exception with all error messages');
     $t->is($e['s2']->getCode(), 'max_length', '->clean() throws an exception with all error messages');
@@ -242,30 +243,30 @@ public function getBytes($value)
 }
 
 $t->diag('postValidator can throw named errors or global errors');
-$comparator = new sfValidatorSchemaCompare('left', sfValidatorSchemaCompare::EQUAL, 'right');
-$userValidator = new sfValidatorSchema(array(
-    'test' => new sfValidatorString(array('min_length' => 10)),
-    'left' => new sfValidatorString(array('min_length' => 2)),
-    'right' => new sfValidatorString(array('min_length' => 2)),
-));
+$comparator = new \sfValidatorSchemaCompare('left', \sfValidatorSchemaCompare::EQUAL, 'right');
+$userValidator = new \sfValidatorSchema([
+    'test' => new \sfValidatorString(['min_length' => 10]),
+    'left' => new \sfValidatorString(['min_length' => 2]),
+    'right' => new \sfValidatorString(['min_length' => 2]),
+]);
 $userValidator->setPostValidator($comparator);
-$v = new sfValidatorSchema(array(
-    'test' => new sfValidatorString(array('min_length' => 10)),
-    'left' => new sfValidatorString(array('min_length' => 2)),
-    'right' => new sfValidatorString(array('min_length' => 2)),
+$v = new \sfValidatorSchema([
+    'test' => new \sfValidatorString(['min_length' => 10]),
+    'left' => new \sfValidatorString(['min_length' => 2]),
+    'right' => new \sfValidatorString(['min_length' => 2]),
     'embedded' => $userValidator,
-));
+]);
 $v->setPostValidator($comparator);
 
 $t->diag('postValidator throws global errors');
-foreach (array($userValidator->getPostValidator(), $v->getPostValidator(), $v['embedded']->getPostValidator()) as $validator) {
+foreach ([$userValidator->getPostValidator(), $v->getPostValidator(), $v['embedded']->getPostValidator()] as $validator) {
     $validator->setOption('throw_global_error', true);
 }
 
 try {
-    $v->clean(array('test' => 'fabien', 'right' => 'bar', 'embedded' => array('test' => 'fabien', 'left' => 'oof', 'right' => 'rab')));
+    $v->clean(['test' => 'fabien', 'right' => 'bar', 'embedded' => ['test' => 'fabien', 'left' => 'oof', 'right' => 'rab']]);
     $t->skip('', 7);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->is(count($e->getNamedErrors()), 3, '->clean() throws an exception with all error messages');
     $t->is(count($e->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
     $t->is(count($e['embedded']->getNamedErrors()), 1, '->clean() throws an exception with all error messages');
@@ -276,14 +277,14 @@ public function getBytes($value)
 }
 
 $t->diag('postValidator throws named errors');
-foreach (array($userValidator->getPostValidator(), $v->getPostValidator(), $v['embedded']->getPostValidator()) as $validator) {
+foreach ([$userValidator->getPostValidator(), $v->getPostValidator(), $v['embedded']->getPostValidator()] as $validator) {
     $validator->setOption('throw_global_error', false);
 }
 
 try {
-    $v->clean(array('test' => 'fabien', 'right' => 'bar', 'embedded' => array('test' => 'fabien', 'left' => 'oof', 'right' => 'rab')));
+    $v->clean(['test' => 'fabien', 'right' => 'bar', 'embedded' => ['test' => 'fabien', 'left' => 'oof', 'right' => 'rab']]);
     $t->skip('', 7);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->is(count($e->getNamedErrors()), 3, '->clean() throws an exception with all error messages');
     $t->is(count($e->getGlobalErrors()), 0, '->clean() throws an exception with all error messages');
     $t->is(count($e['embedded']->getNamedErrors()), 2, '->clean() throws an exception with all error messages');
@@ -294,19 +295,19 @@ public function getBytes($value)
 }
 
 $t->diag('complex postValidator');
-$comparator1 = new sfValidatorSchemaCompare('password', sfValidatorSchemaCompare::EQUAL, 'password_bis');
-$v = new sfValidatorSchema(array(
-    'left' => new sfValidatorString(array('min_length' => 2)),
-    'right' => new sfValidatorString(array('min_length' => 2)),
-    'password' => new sfValidatorString(array('min_length' => 2)),
-    'password_bis' => new sfValidatorString(array('min_length' => 2)),
-));
-$v->setPostValidator(new sfValidatorAnd(array($comparator, $comparator1)));
+$comparator1 = new \sfValidatorSchemaCompare('password', \sfValidatorSchemaCompare::EQUAL, 'password_bis');
+$v = new \sfValidatorSchema([
+    'left' => new \sfValidatorString(['min_length' => 2]),
+    'right' => new \sfValidatorString(['min_length' => 2]),
+    'password' => new \sfValidatorString(['min_length' => 2]),
+    'password_bis' => new \sfValidatorString(['min_length' => 2]),
+]);
+$v->setPostValidator(new \sfValidatorAnd([$comparator, $comparator1]));
 
 try {
-    $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab'));
+    $v->clean(['left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab']);
     $t->skip('', 3);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->is(count($e->getNamedErrors()), 2, '->clean() throws an exception with all error messages');
     $t->is(count($e->getGlobalErrors()), 0, '->clean() throws an exception with all error messages');
     $t->is($e->getCode(), 'left [invalid] password [invalid]', '->clean() throws an exception with all error messages');
@@ -315,34 +316,34 @@ public function getBytes($value)
 $comparator->setOption('throw_global_error', true);
 
 try {
-    $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab'));
+    $v->clean(['left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab']);
     $t->skip('', 3);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->is(count($e->getNamedErrors()), 1, '->clean() throws an exception with all error messages');
     $t->is(count($e->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
     $t->is($e->getCode(), 'invalid password [invalid]', '->clean() throws an exception with all error messages');
 }
 
-$userValidator = new sfValidatorSchema(array(
-    'left' => new sfValidatorString(array('min_length' => 2)),
-    'right' => new sfValidatorString(array('min_length' => 2)),
-    'password' => new sfValidatorString(array('min_length' => 2)),
-    'password_bis' => new sfValidatorString(array('min_length' => 2)),
-));
-$userValidator->setPostValidator(new sfValidatorAnd(array($comparator, $comparator1)));
-$v = new sfValidatorSchema(array(
-    'left' => new sfValidatorString(array('min_length' => 2)),
-    'right' => new sfValidatorString(array('min_length' => 2)),
-    'password' => new sfValidatorString(array('min_length' => 2)),
-    'password_bis' => new sfValidatorString(array('min_length' => 2)),
+$userValidator = new \sfValidatorSchema([
+    'left' => new \sfValidatorString(['min_length' => 2]),
+    'right' => new \sfValidatorString(['min_length' => 2]),
+    'password' => new \sfValidatorString(['min_length' => 2]),
+    'password_bis' => new \sfValidatorString(['min_length' => 2]),
+]);
+$userValidator->setPostValidator(new \sfValidatorAnd([$comparator, $comparator1]));
+$v = new \sfValidatorSchema([
+    'left' => new \sfValidatorString(['min_length' => 2]),
+    'right' => new \sfValidatorString(['min_length' => 2]),
+    'password' => new \sfValidatorString(['min_length' => 2]),
+    'password_bis' => new \sfValidatorString(['min_length' => 2]),
     'user' => $userValidator,
-));
-$v->setPostValidator(new sfValidatorAnd(array($comparator, $comparator1)));
+]);
+$v->setPostValidator(new \sfValidatorAnd([$comparator, $comparator1]));
 
 try {
-    $v->clean(array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab', 'user' => array('left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab')));
+    $v->clean(['left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab', 'user' => ['left' => 'foo', 'right' => 'bar', 'password' => 'oof', 'password_bis' => 'rab']]);
     $t->skip('', 7);
-} catch (sfValidatorErrorSchema $e) {
+} catch (\sfValidatorErrorSchema $e) {
     $t->is(count($e->getNamedErrors()), 2, '->clean() throws an exception with all error messages');
     $t->is(count($e->getGlobalErrors()), 1, '->clean() throws an exception with all error messages');
     $t->is(count($e['user']->getNamedErrors()), 1, '->clean() throws an exception with all error messages');
@@ -354,7 +355,7 @@ public function getBytes($value)
 
 // __clone()
 $t->diag('__clone()');
-$v = new sfValidatorSchema(array('v1' => $v1, 'v2' => $v2));
+$v = new \sfValidatorSchema(['v1' => $v1, 'v2' => $v2]);
 $v1 = clone $v;
 $f1 = $v1->getFields();
 $f = $v->getFields();
@@ -366,8 +367,8 @@ public function getBytes($value)
 $t->is($v1->getPreValidator(), null, '__clone() clones the pre validator');
 $t->is($v1->getPostValidator(), null, '__clone() clones the post validator');
 
-$v->setPreValidator(new sfValidatorString(array('min_length' => 4)));
-$v->setPostValidator(new sfValidatorString(array('min_length' => 4)));
+$v->setPreValidator(new \sfValidatorString(['min_length' => 4]));
+$v->setPostValidator(new \sfValidatorString(['min_length' => 4]));
 $v1 = clone $v;
 $t->ok($v1->getPreValidator() !== $v->getPreValidator(), '__clone() clones the pre validator');
 $t->ok($v1->getPreValidator() == $v->getPreValidator(), '__clone() clones the pre validator');
@@ -375,7 +376,7 @@ public function getBytes($value)
 $t->ok($v1->getPostValidator() == $v->getPostValidator(), '__clone() clones the post validator');
 
 $t->diag('convert post_max_size to bytes');
-$v = new BytesValidatorSchema();
+$v = new \BytesValidatorSchema();
 $t->is($v->getBytes(null), 0, 'empty string considered as 0 bytes');
 $t->is($v->getBytes(''), 0, 'empty string considered as 0 bytes');
 $t->is($v->getBytes('0'), 0, 'simple bytes');
diff --git a/test/unit/validator/sfValidatorStringTest.php b/test/unit/validator/sfValidatorStringTest.php
index 97fddfd12..4d4d107ca 100644
--- a/test/unit/validator/sfValidatorStringTest.php
+++ b/test/unit/validator/sfValidatorStringTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(12);
+$t = new \lime_test(12);
 
-$v = new sfValidatorString();
+$v = new \sfValidatorString();
 
 // ->clean()
 $t->diag('->clean()');
@@ -29,7 +30,7 @@
     $v->clean('foo');
     $t->fail('"max_length" option set the maximum length of the string');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"max_length" option set the maximum length of the string');
     $t->is($e->getCode(), 'max_length', '->clean() throws a sfValidatorError');
 }
@@ -39,7 +40,7 @@
 try {
     $v->clean('foo');
     $t->fail('"max_length" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Too long', '"max_length" error message customization');
 }
 
@@ -52,7 +53,7 @@
     $v->clean('fo');
     $t->fail('"min_length" option set the minimum length of the string');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('"min_length" option set the minimum length of the string');
     $t->is($e->getCode(), 'min_length', '->clean() throws a sfValidatorError');
 }
@@ -62,7 +63,7 @@
 try {
     $v->clean('fo');
     $t->fail('"min_length" error message customization');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->is($e->getMessage(), 'Too short', '"min_length" error message customization');
 }
 
diff --git a/test/unit/validator/sfValidatorTimeTest.php b/test/unit/validator/sfValidatorTimeTest.php
index 1eb4f2d6f..894682b5e 100644
--- a/test/unit/validator/sfValidatorTimeTest.php
+++ b/test/unit/validator/sfValidatorTimeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(27);
+$t = new \lime_test(27);
 
-$v = new sfValidatorTime();
+$v = new \sfValidatorTime();
 
 // ->clean()
 $t->diag('->clean()');
@@ -29,7 +30,7 @@
     $v->clean('This is not a time');
     $t->fail('->clean() throws a sfValidatorError if the time is a string and is not parsable by strtotime');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the time is a string and is not parsable by strtotime');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -40,35 +41,35 @@
 
 // validate date array
 $t->diag('validate date array');
-$t->is($v->clean(array('hour' => 20, 'minute' => 10, 'second' => 15)), '20:10:15', '->clean() accepts an array as an input');
-$t->is($v->clean(array('hour' => '20', 'minute' => '10', 'second' => '15')), '20:10:15', '->clean() accepts an array as an input');
-$t->is($v->clean(array('hour' => '', 'minute' => '', 'second' => '')), null, '->clean() accepts an array as an input');
-$t->is($v->clean(array('hour' => 0, 'minute' => 0, 'second' => 0)), '00:00:00', '->clean() accepts an array as an input');
-$t->is($v->clean(array('hour' => '0', 'minute' => '0', 'second' => '0')), '00:00:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['hour' => 20, 'minute' => 10, 'second' => 15]), '20:10:15', '->clean() accepts an array as an input');
+$t->is($v->clean(['hour' => '20', 'minute' => '10', 'second' => '15']), '20:10:15', '->clean() accepts an array as an input');
+$t->is($v->clean(['hour' => '', 'minute' => '', 'second' => '']), null, '->clean() accepts an array as an input');
+$t->is($v->clean(['hour' => 0, 'minute' => 0, 'second' => 0]), '00:00:00', '->clean() accepts an array as an input');
+$t->is($v->clean(['hour' => '0', 'minute' => '0', 'second' => '0']), '00:00:00', '->clean() accepts an array as an input');
 
 try {
-    $v->clean(array('hour' => '', 'minute' => 0, 'second' => 0));
+    $v->clean(['hour' => '', 'minute' => 0, 'second' => 0]);
     $t->fail('->clean() throws a sfValidatorError if time date is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the time is not valid');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 try {
-    $v->clean(array('hour' => '', 'minute' => 1, 'second' => 15));
+    $v->clean(['hour' => '', 'minute' => 1, 'second' => 15]);
     $t->fail('->clean() throws a sfValidatorError if time date is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the time is not valid');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
 
 try {
-    $v->clean(array('hour' => -2, 'minute' => 1, 'second' => 15));
+    $v->clean(['hour' => -2, 'minute' => 1, 'second' => 15]);
     $t->fail('->clean() throws a sfValidatorError if the time is not valid');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the time is not valid');
     $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
 }
@@ -82,7 +83,7 @@
     $v->clean('20.10-18');
     $t->fail('->clean() throws a sfValidatorError if the time does not match the regex');
     $t->skip('', 2);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() throws a sfValidatorError if the time does not match the regex');
     $t->like($e->getMessage(), '/'.preg_quote(htmlspecialchars($v->getOption('time_format'), ENT_QUOTES, 'UTF-8'), '/').'/', '->clean() returns the expected time format in the error message');
     $t->is($e->getCode(), 'bad_format', '->clean() throws a sfValidatorError');
@@ -93,7 +94,7 @@
 try {
     $v->clean('20.10-18');
     $t->skip('', 1);
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->like($e->getMessage(), '/'.preg_quote('hh/mm/ss', '/').'/', '->clean() returns the expected time format error if provided');
 }
 
@@ -105,17 +106,17 @@
 $t->is($v->clean(time()), time(), '->clean() output format can be change with the time_output option');
 
 // required
-$v = new sfValidatorTime();
-foreach (array(
-    array('hour' => '', 'minute' => '', 'second' => ''),
-    array('hour' => null, 'minute' => null, 'second' => null),
+$v = new \sfValidatorTime();
+foreach ([
+    ['hour' => '', 'minute' => '', 'second' => ''],
+    ['hour' => null, 'minute' => null, 'second' => null],
     '',
     null,
-) as $input) {
+] as $input) {
     try {
         $v->clean($input);
         $t->fail('->clean() throws an exception if the time is empty and required is true');
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass('->clean() throws an exception if the time is empty and required is true');
     }
 }
diff --git a/test/unit/validator/sfValidatorUrlTest.php b/test/unit/validator/sfValidatorUrlTest.php
index 754b61fd4..52f00a6d6 100644
--- a/test/unit/validator/sfValidatorUrlTest.php
+++ b/test/unit/validator/sfValidatorUrlTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(15);
+$t = new \lime_test(15);
 
-$v = new sfValidatorUrl();
+$v = new \sfValidatorUrl();
 
 // ->clean()
 $t->diag('->clean()');
-foreach (array(
+foreach ([
     'http://www.google.com',
     'https://google.com/',
     'https://google.com:80/',
@@ -24,30 +25,30 @@
     'http://127.0.0.1/',
     'http://127.0.0.1:80/',
     'ftp://google.com/foo.tgz',
-    'ftps://google.com/foo.tgz', ) as $url) {
+    'ftps://google.com/foo.tgz', ] as $url) {
     $t->is($v->clean($url), $url, '->clean() checks that the value is a valid URL');
 }
 
-foreach (array(
+foreach ([
     'google.com',
     'http:/google.com',
     'http://google.com::aa',
-) as $nonUrl) {
+] as $nonUrl) {
     try {
         $v->clean($nonUrl);
         $t->fail('->clean() throws an sfValidatorError if the value is not a valid URL');
         $t->skip('', 1);
-    } catch (sfValidatorError $e) {
+    } catch (\sfValidatorError $e) {
         $t->pass('->clean() throws an sfValidatorError if the value is not a valid URL');
         $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
     }
 }
 
-$v = new sfValidatorUrl(array('protocols' => array('http', 'https')));
+$v = new \sfValidatorUrl(['protocols' => ['http', 'https']]);
 
 try {
     $v->clean('ftp://google.com/foo.tgz');
     $t->fail('->clean() only allows protocols specified in the protocols option');
-} catch (sfValidatorError $e) {
+} catch (\sfValidatorError $e) {
     $t->pass('->clean() only allows protocols specified in the protocols option');
 }
diff --git a/test/unit/view/sfViewCacheManagerTest.php b/test/unit/view/sfViewCacheManagerTest.php
index 24f004c57..baa714625 100644
--- a/test/unit/view/sfViewCacheManagerTest.php
+++ b/test/unit/view/sfViewCacheManagerTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,40 +13,40 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(41);
+$t = new \lime_test(41);
 
 function get_cache_manager($context)
 {
-    myCache::clear();
+    \myCache::clear();
 
-    return new myViewCacheManager($context, new myCache());
+    return new \myViewCacheManager($context, new \myCache());
 }
 
 function get_cache_config($contextual = false)
 {
-    return array(
+    return [
         'withLayout' => false,
         'lifeTime' => 86400,
         'clientLifeTime' => 86400,
         'contextual' => $contextual,
-        'vary' => array(),
-    );
+        'vary' => [],
+    ];
 }
 
-class myViewCacheManager extends sfViewCacheManager
+class myViewCacheManager extends \sfViewCacheManager
 {
     public function registerConfiguration($moduleName)
     {
     }
 }
 
-class myController extends sfWebController
+class myController extends \sfWebController
 {
 }
 
 class myRequest
 {
-    public $getParameters = array('page' => 5, 'sort' => 'asc');
+    public $getParameters = ['page' => 5, 'sort' => 'asc'];
 
     public function getHost()
     {
@@ -68,11 +69,11 @@ public function getGetParameters()
     }
 }
 
-class myCache extends sfCache
+class myCache extends \sfCache
 {
-    public static $cache = array();
+    public static $cache = [];
 
-    public function initialize($parameters = array())
+    public function initialize($parameters = [])
     {
     }
 
@@ -106,9 +107,9 @@ public function removePattern($pattern, $delimiter = ':')
         }
     }
 
-    public function clean($mode = sfCache::ALL)
+    public function clean($mode = \sfCache::ALL)
     {
-        self::$cache = array();
+        self::$cache = [];
     }
 
     public function getTimeout($key)
@@ -123,11 +124,11 @@ public function getLastModified($key)
 
     public static function clear()
     {
-        self::$cache = array();
+        self::$cache = [];
     }
 }
 
-class myRouting extends sfPatternRouting
+class myRouting extends \sfPatternRouting
 {
     public $currentInternalUri = 'currentModule/currentAction?currentKey=currentValue';
 
@@ -137,14 +138,14 @@ public function getCurrentInternalUri($with_route_name = false)
     }
 }
 
-$context = sfContext::getInstance(array('controller' => 'myController', 'routing' => 'myRouting', 'request' => 'myRequest'));
+$context = \sfContext::getInstance(['controller' => 'myController', 'routing' => 'myRouting', 'request' => 'myRequest']);
 
 $r = $context->routing;
-$r->connect('default', new sfRoute('/:module/:action/*'));
+$r->connect('default', new \sfRoute('/:module/:action/*'));
 
 // ->initialize()
 $t->diag('->initialize()');
-$m = new myViewCacheManager($context, $cache = new myCache());
+$m = new \myViewCacheManager($context, $cache = new \myCache());
 $t->is($m->getCache(), $cache, '->initialize() takes a sfCache object as its second argument');
 
 // ->generateCacheKey()
@@ -159,21 +160,21 @@ public function getCurrentInternalUri($with_route_name = false)
 try {
     $m->generateCacheKey('@rule?key=value');
     $t->fail('->generateCacheKey() throws an sfException when passed an internal URI with a rule');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->generateCacheKey() throws an sfException when passed an internal URI with a rule');
 }
 
 try {
     $m->generateCacheKey('@sf_cache_partial?module=mymodule&action=myaction');
     $t->pass('->generateCacheKey() does not throw an sfException when passed an internal URI with a @sf_cache_partial rule');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->fail('->generateCacheKey() does not throw an sfException when passed an internal URI with a @sf_cache_partial rule');
 }
 
 try {
     $m->generateCacheKey('@sf_cache_partial?key=value');
     $t->fail('->generateCacheKey() throws an sfException when passed an internal URI with a @sf_cache_partial rule with no module or action param');
-} catch (sfException $e) {
+} catch (\sfException $e) {
     $t->pass('->generateCacheKey() throws an sfException when passed an internal URI with a @sf_cache_partial rule with no module or action param');
 }
 
@@ -186,7 +187,7 @@ public function getCurrentInternalUri($with_route_name = false)
 $t->is($m->generateCacheKey('@sf_cache_partial?module=foo&action=bar&sf_cache_key=value', null, null, 'baz'), '/localhost/all/baz/foo/bar/value', '->generateCacheKey() can take a prefix for contextual partials as fourth parameter');
 
 $m = get_cache_manager($context);
-$m->addCache('module', 'action', array('vary' => array('myheader', 'secondheader')));
+$m->addCache('module', 'action', ['vary' => ['myheader', 'secondheader']]);
 $t->is($m->generateCacheKey('module/action'), '/localhost/myheader-_foo_bar_-secondheader-_foo_bar_/module/action', '->generateCacheKey() creates a directory friendly vary cache key');
 
 // ->generateNamespace()
@@ -274,16 +275,16 @@ public function getCurrentInternalUri($with_route_name = false)
 $t->is($m->has('module/action?key2=value1'), true, '->remove() accepts wildcards in URIs and lets keys not matching the pattern unchanged');
 
 $t->diag('Cache key generation options');
-$m = new myViewCacheManager($context, $cache = new myCache(), array('cache_key_use_vary_headers' => false));
+$m = new \myViewCacheManager($context, $cache = new \myCache(), ['cache_key_use_vary_headers' => false]);
 $t->is($m->generateCacheKey('mymodule/myaction'), '/localhost/mymodule/myaction', '->generateCacheKey() uses "cache_key_use_vary_headers" option to know if vary headers changes cache key.');
 
-$m = new myViewCacheManager($context, $cache = new myCache(), array('cache_key_use_host_name' => false));
+$m = new \myViewCacheManager($context, $cache = new \myCache(), ['cache_key_use_host_name' => false]);
 $t->is($m->generateCacheKey('mymodule/myaction'), '/all/mymodule/myaction', '->generateCacheKey() uses "cache_key_use_host_name" option to know if vary headers changes cache key.');
 
-$m = new myViewCacheManager($context, $cache = new myCache(), array('cache_key_use_host_name' => false, 'cache_key_use_vary_headers' => false));
+$m = new \myViewCacheManager($context, $cache = new \myCache(), ['cache_key_use_host_name' => false, 'cache_key_use_vary_headers' => false]);
 $t->is($m->generateCacheKey('mymodule/myaction'), '/mymodule/myaction', '->generateCacheKey() allows the use of both "cache_key_use_host_name" and "cache_key_use_vary_headers" options.');
 
-$m = new myViewCacheManager($context, new myCache());
+$m = new \myViewCacheManager($context, new \myCache());
 $t->is($m->generateCacheKey('mymodule/myaction?foo=../_bar'), '/localhost/all/mymodule/myaction/foo/_../__bar', '->generateCacheKey() prevents directory traversal');
 $t->is($m->generateCacheKey('mymodule/myaction?foo=..\\_bar'), '/localhost/all/mymodule/myaction/foo/_..\\__bar', '->generateCacheKey() prevents directory traversal');
 
diff --git a/test/unit/view/sfViewParameterHolderTest.php b/test/unit/view/sfViewParameterHolderTest.php
index 743007538..7aca07f40 100644
--- a/test/unit/view/sfViewParameterHolderTest.php
+++ b/test/unit/view/sfViewParameterHolderTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,7 +13,7 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(21);
+$t = new \lime_test(21);
 
 define('ESC_SPECIALCHARS', 'esc_specialchars');
 function esc_specialchars($value)
@@ -30,22 +31,22 @@ class myRequest
 {
     public function getParameterHolder()
     {
-        return new sfParameterHolder();
+        return new \sfParameterHolder();
     }
 }
 
-$context = sfContext::getInstance();
+$context = \sfContext::getInstance();
 $dispatcher = $context->dispatcher;
 
 // ->initialize()
 $t->diag('->initialize()');
-$p = new sfViewParameterHolder($dispatcher);
-$t->is($p->getAll(), array(), '->initialize() initializes the parameters as an empty array');
+$p = new \sfViewParameterHolder($dispatcher);
+$t->is($p->getAll(), [], '->initialize() initializes the parameters as an empty array');
 
-$p->initialize($dispatcher, array('foo' => 'bar'));
+$p->initialize($dispatcher, ['foo' => 'bar']);
 $t->is($p->get('foo'), 'bar', '->initialize() takes an array of default parameters as its second argument');
 
-$p->initialize($dispatcher, array(), array('escaping_strategy' => 'on', 'escaping_method' => 'ESC_RAW'));
+$p->initialize($dispatcher, [], ['escaping_strategy' => 'on', 'escaping_method' => 'ESC_RAW']);
 $t->is($p->getEscaping(), 'on', '->initialize() takes an array of options as its third argument');
 $t->is($p->getEscapingMethod(), ESC_RAW, '->initialize() takes an array of options as its third argument');
 
@@ -74,24 +75,24 @@ public function getParameterHolder()
     $p->setEscapingMethod('nonexistant');
     $p->getEscapingMethod();
     $t->fail('->getEscapingMethod() throws an InvalidArgumentException if the escaping method does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->getEscapingMethod() throws an InvalidArgumentException if the escaping method does not exist');
 }
 
 // ->toArray()
 $t->diag('->toArray()');
-$p->initialize($dispatcher, array('foo' => 'bar'));
+$p->initialize($dispatcher, ['foo' => 'bar']);
 $a = $p->toArray();
 $t->is($a['foo'], 'bar', '->toArray() returns an array representation of the parameter holder');
 
 // escaping strategies
-$p = new sfViewParameterHolder(new sfEventDispatcher(), array('foo' => 'bar'));
+$p = new \sfViewParameterHolder(new \sfEventDispatcher(), ['foo' => 'bar']);
 
 try {
     $p->setEscaping('null');
     $p->toArray();
     $t->fail('->toArray() throws an InvalidArgumentException if the escaping strategy does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->toArray() throws an InvalidArgumentException if the escaping strategy does not exist');
 }
 
@@ -113,6 +114,6 @@ public function getParameterHolder()
 
 // ->serialize() / ->unserialize()
 $t->diag('->serialize() / ->unserialize()');
-$p->initialize($dispatcher, array('foo' => 'bar'));
+$p->initialize($dispatcher, ['foo' => 'bar']);
 $unserialized = unserialize(serialize($p));
 $t->is($p->toArray(), $unserialized->toArray(), 'sfViewParameterHolder implements the Serializable interface');
diff --git a/test/unit/view/sfViewTest.php b/test/unit/view/sfViewTest.php
index 69e8b1d7e..3cee162c8 100644
--- a/test/unit/view/sfViewTest.php
+++ b/test/unit/view/sfViewTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,9 +13,9 @@
 
 require_once $_test_dir.'/unit/sfContextMock.class.php';
 
-$t = new lime_test(19);
+$t = new \lime_test(19);
 
-class myView extends sfView
+class myView extends \sfView
 {
     public function execute()
     {
@@ -33,7 +34,7 @@ public function render()
     }
 }
 
-class configuredView extends myView
+class configuredView extends \myView
 {
     public static $isDecorated = false;
 
@@ -45,9 +46,9 @@ public function initialize($context, $moduleName, $actionName, $viewName)
     }
 }
 
-$context = sfContext::getInstance(array('request' => 'sfWebRequest', 'response' => 'sfWebResponse'));
+$context = \sfContext::getInstance(['request' => 'sfWebRequest', 'response' => 'sfWebResponse']);
 
-$view = new myView($context, '', '', '');
+$view = new \myView($context, '', '', '');
 
 // ->isDecorator() ->setDecorator()
 $t->diag('->isDecorator() ->setDecorator()');
@@ -57,34 +58,34 @@ public function initialize($context, $moduleName, $actionName, $viewName)
 
 // format
 $t->diag('format');
-$context = sfContext::getInstance(array('request' => 'sfWebRequest', 'response' => 'sfWebResponse'), true);
+$context = \sfContext::getInstance(['request' => 'sfWebRequest', 'response' => 'sfWebResponse'], true);
 $context->getRequest()->setFormat('js', 'application/x-javascript');
 $context->getRequest()->setRequestFormat('js');
-configuredView::$isDecorated = true;
-$view = new configuredView($context, '', '', '');
+\configuredView::$isDecorated = true;
+$view = new \configuredView($context, '', '', '');
 $t->is($view->isDecorator(), false, '->initialize() uses the format to configure the view');
 $t->is($context->getResponse()->getContentType(), 'application/x-javascript', '->initialize() uses the format to configure the view');
 $t->is($view->getExtension(), '.js.php', '->initialize() uses the format to configure the view');
-$context = sfContext::getInstance(array('request' => 'sfWebRequest', 'response' => 'sfWebResponse'), true);
+$context = \sfContext::getInstance(['request' => 'sfWebRequest', 'response' => 'sfWebResponse'], true);
 $context->getEventDispatcher()->connect('view.configure_format', 'configure_format');
 
 $context->getRequest()->setRequestFormat('js');
-configuredView::$isDecorated = true;
-$view = new configuredView($context, '', '', '');
+\configuredView::$isDecorated = true;
+$view = new \configuredView($context, '', '', '');
 $t->is($view->isDecorator(), true, '->initialize() uses the format to configure the view');
 $t->is($context->getResponse()->getContentType(), 'application/javascript', '->initialize() uses the format to configure the view');
 
 // parameter holder proxy
 require_once $_test_dir.'/unit/sfParameterHolderTest.class.php';
-$pht = new sfParameterHolderProxyTest($t);
+$pht = new \sfParameterHolderProxyTest($t);
 $pht->launchTests($view, 'parameter');
 
 // new methods via sfEventDispatcher
 require_once $_test_dir.'/unit/sfEventDispatcherTest.class.php';
-$dispatcherTest = new sfEventDispatcherTest($t);
+$dispatcherTest = new \sfEventDispatcherTest($t);
 $dispatcherTest->launchTests($context->getEventDispatcher(), $view, 'view');
 
-function configure_format(sfEvent $event)
+function configure_format(\sfEvent $event)
 {
     $event->getSubject()->setDecorator(true);
     $event['response']->setContentType('application/javascript');
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
index af98334e4..9fcca6c71 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,29 +11,29 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(8);
+$t = new \lime_test(8);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
 $t->diag('->configure()');
 
 try {
-    new sfWidgetFormI18nChoiceCountry(array('culture' => 'en', 'countries' => array('EN')));
+    new \sfWidgetFormI18nChoiceCountry(['culture' => 'en', 'countries' => ['EN']]);
     $t->fail('->configure() throws an InvalidArgumentException if a country does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->configure() throws an InvalidArgumentException if a country does not exist');
 }
 
-$v = new sfWidgetFormI18nChoiceCountry(array('culture' => 'en', 'countries' => array('FR', 'GB')));
-$t->is(array_keys($v->getOption('choices')), array('FR', 'GB'), '->configure() can restrict the number of countries with the countries option');
+$v = new \sfWidgetFormI18nChoiceCountry(['culture' => 'en', 'countries' => ['FR', 'GB']]);
+$t->is(array_keys($v->getOption('choices')), ['FR', 'GB'], '->configure() can restrict the number of countries with the countries option');
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormI18nChoiceCountry(array('culture' => 'fr'));
+$w = new \sfWidgetFormI18nChoiceCountry(['culture' => 'fr']);
 $dom->loadHTML($w->render('country', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#country option[value="FR"]')->getValue(), 'France', '->render() renders all countries as option tags');
 $t->is(count($css->matchAll('#country option[value="FR"][selected="selected"]')->getNodes()), 1, '->render() renders all countries as option tags');
 
@@ -43,12 +44,12 @@
 
 // add_empty
 $t->diag('add_empty');
-$w = new sfWidgetFormI18nChoiceCountry(array('culture' => 'fr', 'add_empty' => true));
+$w = new \sfWidgetFormI18nChoiceCountry(['culture' => 'fr', 'add_empty' => true]);
 $dom->loadHTML($w->render('country', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#country option[value=""]')->getValue(), '', '->render() renders an empty option if add_empty is true');
 
-$w = new sfWidgetFormI18nChoiceCountry(array('culture' => 'fr', 'add_empty' => 'foo'));
+$w = new \sfWidgetFormI18nChoiceCountry(['culture' => 'fr', 'add_empty' => 'foo']);
 $dom->loadHTML($w->render('country', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#country option[value=""]')->getValue(), 'foo', '->render() renders an empty option if add_empty is true');
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
index 75757b805..47fb2c221 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,29 +11,29 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
 $t->diag('->configure()');
 
 try {
-    new sfWidgetFormI18nChoiceCurrency(array('culture' => 'en', 'currencies' => array('xx')));
+    new \sfWidgetFormI18nChoiceCurrency(['culture' => 'en', 'currencies' => ['xx']]);
     $t->fail('->configure() throws an InvalidArgumentException if a currency does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->configure() throws an InvalidArgumentException if a currency does not exist');
 }
 
-$v = new sfWidgetFormI18nChoiceCurrency(array('culture' => 'en', 'currencies' => array('EUR', 'USD')));
-$t->is(array_keys($v->getOption('choices')), array('EUR', 'USD'), '->configure() can restrict the number of currencies with the currencies option');
+$v = new \sfWidgetFormI18nChoiceCurrency(['culture' => 'en', 'currencies' => ['EUR', 'USD']]);
+$t->is(array_keys($v->getOption('choices')), ['EUR', 'USD'], '->configure() can restrict the number of currencies with the currencies option');
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormI18nChoiceCurrency(array('culture' => 'fr'));
+$w = new \sfWidgetFormI18nChoiceCurrency(['culture' => 'fr']);
 $dom->loadHTML($w->render('currency', 'EUR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#currency option[value="EUR"]')->getValue(), 'euro', '->render() renders all currencies as option tags');
 $t->is(count($css->matchAll('#currency option[value="EUR"][selected="selected"]')->getNodes()), 1, '->render() renders all currencies as option tags');
 
@@ -42,12 +43,12 @@
 
 // add_empty
 $t->diag('add_empty');
-$w = new sfWidgetFormI18nChoiceCurrency(array('culture' => 'fr', 'add_empty' => true));
+$w = new \sfWidgetFormI18nChoiceCurrency(['culture' => 'fr', 'add_empty' => true]);
 $dom->loadHTML($w->render('currency', 'EUR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#currency option[value=""]')->getValue(), '', '->render() renders an empty option if add_empty is true');
 
-$w = new sfWidgetFormI18nChoiceCurrency(array('culture' => 'fr', 'add_empty' => 'foo'));
+$w = new \sfWidgetFormI18nChoiceCurrency(['culture' => 'fr', 'add_empty' => 'foo']);
 $dom->loadHTML($w->render('currency', 'EUR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#currency option[value=""]')->getValue(), 'foo', '->render() renders an empty option if add_empty is true');
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
index a5f477c1c..7118e4793 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,40 +11,40 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
 $t->diag('->configure()');
 
 try {
-    new sfWidgetFormI18nChoiceLanguage(array('culture' => 'en', 'languages' => array('xx')));
+    new \sfWidgetFormI18nChoiceLanguage(['culture' => 'en', 'languages' => ['xx']]);
     $t->fail('->configure() throws an InvalidArgumentException if a language does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->configure() throws an InvalidArgumentException if a language does not exist');
 }
 
-$v = new sfWidgetFormI18nChoiceLanguage(array('culture' => 'en', 'languages' => array('fr', 'en')));
-$t->is(array_keys($v->getOption('choices')), array('en', 'fr'), '->configure() can restrict the number of languages with the languages option');
+$v = new \sfWidgetFormI18nChoiceLanguage(['culture' => 'en', 'languages' => ['fr', 'en']]);
+$t->is(array_keys($v->getOption('choices')), ['en', 'fr'], '->configure() can restrict the number of languages with the languages option');
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormI18nChoiceLanguage(array('culture' => 'fr'));
+$w = new \sfWidgetFormI18nChoiceLanguage(['culture' => 'fr']);
 $dom->loadHTML($w->render('language', 'en'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#language option[value="en"]')->getValue(), 'anglais', '->render() renders all languages as option tags');
 $t->is(count($css->matchAll('#language option[value="en"][selected="selected"]')->getNodes()), 1, '->render() renders all languages as option tags');
 
 // add_empty
 $t->diag('add_empty');
-$w = new sfWidgetFormI18nChoiceLanguage(array('culture' => 'fr', 'add_empty' => true));
+$w = new \sfWidgetFormI18nChoiceLanguage(['culture' => 'fr', 'add_empty' => true]);
 $dom->loadHTML($w->render('language', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#language option[value=""]')->getValue(), '', '->render() renders an empty option if add_empty is true');
 
-$w = new sfWidgetFormI18nChoiceLanguage(array('culture' => 'fr', 'add_empty' => 'foo'));
+$w = new \sfWidgetFormI18nChoiceLanguage(['culture' => 'fr', 'add_empty' => 'foo']);
 $dom->loadHTML($w->render('language', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#language option[value=""]')->getValue(), 'foo', '->render() renders an empty option if add_empty is true');
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php b/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
index 7447df752..78c9ed668 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,27 +11,27 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormI18nChoiceTimezone();
+$w = new \sfWidgetFormI18nChoiceTimezone();
 $dom->loadHTML($w->render('timezone', 'Europe/Paris'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#timezone option[value="Europe/Paris"]')->getValue(), 'Europe/Paris', '->render() renders all timezones as option tags');
 $t->is(count($css->matchAll('#timezone option[value="Europe/Paris"][selected="selected"]')->getNodes()), 1, '->render() renders all timezones as option tags');
 
 // add_empty
 $t->diag('add_empty');
-$w = new sfWidgetFormI18nChoiceTimezone(array('culture' => 'fr', 'add_empty' => true));
+$w = new \sfWidgetFormI18nChoiceTimezone(['culture' => 'fr', 'add_empty' => true]);
 $dom->loadHTML($w->render('language', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#language option[value=""]')->getValue(), '', '->render() renders an empty option if add_empty is true');
 
-$w = new sfWidgetFormI18nChoiceTimezone(array('culture' => 'fr', 'add_empty' => 'foo'));
+$w = new \sfWidgetFormI18nChoiceTimezone(['culture' => 'fr', 'add_empty' => 'foo']);
 $dom->loadHTML($w->render('language', 'FR'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#language option[value=""]')->getValue(), 'foo', '->render() renders an empty option if add_empty is true');
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php b/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
index d4e0a8408..5e1119a0b 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,36 +11,36 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
 $t->diag('->configure()');
 
-$w = new sfWidgetFormI18nDate(array('culture' => 'fr'));
+$w = new \sfWidgetFormI18nDate(['culture' => 'fr']);
 $t->is($w->getOption('format'), '%day%/%month%/%year%', '->configure() automatically changes the date format for the given culture');
-$w = new sfWidgetFormI18nDate(array('culture' => 'en_US'));
+$w = new \sfWidgetFormI18nDate(['culture' => 'en_US']);
 $t->is($w->getOption('format'), '%month%/%day%/%year%', '->configure() automatically changes the date format for the given culture');
-$w = new sfWidgetFormI18nDate(array('culture' => 'sr'));
+$w = new \sfWidgetFormI18nDate(['culture' => 'sr']);
 $t->is($w->getOption('format'), '%day%.%month%.%year%.', '->configure() automatically changes the date format for the given culture');
 
-$w = new sfWidgetFormI18nDate(array('culture' => 'fr', 'month_format' => 'name'));
+$w = new \sfWidgetFormI18nDate(['culture' => 'fr', 'month_format' => 'name']);
 $months = $w->getOption('months');
 $t->is($months[2], 'février', '->configure() automatically changes the date format for the given culture');
 
-$w = new sfWidgetFormI18nDate(array('culture' => 'fr', 'month_format' => 'short_name'));
+$w = new \sfWidgetFormI18nDate(['culture' => 'fr', 'month_format' => 'short_name']);
 $months = $w->getOption('months');
 $t->is($months[2], 'févr.', '->configure() automatically changes the date format for the given culture');
 
-$w = new sfWidgetFormI18nDate(array('culture' => 'fr', 'month_format' => 'number'));
+$w = new \sfWidgetFormI18nDate(['culture' => 'fr', 'month_format' => 'number']);
 $months = $w->getOption('months');
 $t->is($months[2], '02', '->configure() automatically changes the date format for the given culture');
 
 try {
-    new sfWidgetFormI18nDate(array('culture' => 'fr', 'month_format' => 'nonexistant'));
+    new \sfWidgetFormI18nDate(['culture' => 'fr', 'month_format' => 'nonexistant']);
     $t->fail('->configure() throws an InvalidArgumentException if the month_format type does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->configure() throws an InvalidArgumentException if the month_format type does not exist');
 }
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php b/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
index 897b37748..fb3bffe18 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
 $t->diag('->configure()');
 
-$w = new sfWidgetFormI18nDateTime(array('culture' => 'fr'));
+$w = new \sfWidgetFormI18nDateTime(['culture' => 'fr']);
 $t->is($w->getOption('format'), '%date% %time%', '->configure() automatically changes the date format for the given culture');
diff --git a/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php b/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
index 32e7e0a66..24f148d23 100644
--- a/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
+++ b/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,18 +11,18 @@
 
 require_once __DIR__.'/../../../bootstrap/unit.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->configure()
 $t->diag('->configure()');
 
-$w = new sfWidgetFormI18nTime(array('culture' => 'fr'));
+$w = new \sfWidgetFormI18nTime(['culture' => 'fr']);
 $t->is($w->getOption('format'), '%hour%:%minute%:%second%', '->configure() automatically changes the date format for the given culture');
 $t->is($w->getOption('format_without_seconds'), '%hour%:%minute%', '->configure() automatically changes the date format for the given culture');
 
-$w = new sfWidgetFormI18nTime(array('culture' => 'sr'));
+$w = new \sfWidgetFormI18nTime(['culture' => 'sr']);
 $t->is($w->getOption('format'), '%hour%.%minute%.%second%', '->configure() automatically changes the date format for the given culture');
 $t->is($w->getOption('format_without_seconds'), '%hour%.%minute%', '->configure() automatically changes the date format for the given culture');
diff --git a/test/unit/widget/sfWidgetFormChoiceTest.php b/test/unit/widget/sfWidgetFormChoiceTest.php
index 86a5f02c6..9103bc99b 100644
--- a/test/unit/widget/sfWidgetFormChoiceTest.php
+++ b/test/unit/widget/sfWidgetFormChoiceTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,26 +11,26 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-$t = new lime_test(19);
+$t = new \lime_test(19);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->getRenderer()
 $t->diag('->getRenderer()');
-$w = new sfWidgetFormChoice(array('choices' => array()));
+$w = new \sfWidgetFormChoice(['choices' => []]);
 $t->is(get_class($w->getRenderer()), 'sfWidgetFormSelect', '->getRenderer() guesses the renderer class to use');
 $w->setOption('multiple', true);
 $t->is(get_class($w->getRenderer()), 'sfWidgetFormSelect', '->getRenderer() guesses the renderer class to use');
@@ -38,21 +39,21 @@ public function translate($subject, $parameters = array())
 $w->setOption('multiple', false);
 $t->is(get_class($w->getRenderer()), 'sfWidgetFormSelectRadio', '->getRenderer() guesses the renderer class to use');
 
-class MyWidget extends sfWidgetFormChoice
+class MyWidget extends \sfWidgetFormChoice
 {
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return null;
     }
 
     public function getJavaScripts()
     {
-        return array('/path/to/a/file.js');
+        return ['/path/to/a/file.js'];
     }
 
     public function getStylesheets()
     {
-        return array('/path/to/a/file.css' => 'all');
+        return ['/path/to/a/file.css' => 'all'];
     }
 }
 
@@ -60,12 +61,12 @@ public function getStylesheets()
 $t->is(get_class($w->getRenderer()), 'MyWidget', '->getRenderer() uses the renderer_class as the widget class if provided');
 
 $w->setOption('renderer_class', null);
-$w->setOption('renderer', new MyWidget(array('choices' => array())));
+$w->setOption('renderer', new \MyWidget(['choices' => []]));
 $t->is(get_class($w->getRenderer()), 'MyWidget', '->getRenderer() uses the renderer as the widget if provided');
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormChoice(array('choices' => array('foo' => 'bar')));
+$w = new \sfWidgetFormChoice(['choices' => ['foo' => 'bar']]);
 $t->like($w->render('foo'), '/<select name="foo" id="foo">/', '->render() renders a select tag by default');
 $w->setIdFormat('barID_%s');
 $t->like($w->render('foo'), '/<select name="foo" id="barID_foo">/', '->render() uses the id format specified');
@@ -80,44 +81,44 @@ public function getStylesheets()
 // choices are translated
 $t->diag('choices are translated');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormChoice(array('choices' => array('foo' => 'bar', 'foobar' => 'foo')));
+$w = new \sfWidgetFormChoice(['choices' => ['foo' => 'bar', 'foobar' => 'foo']]);
 $w->setParent($ws);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo option[value="foo"]')->getValue(), 'translation[bar]', '->render() translates the options');
 $t->is($css->matchSingle('#foo option[value="foobar"]')->getValue(), 'translation[foo]', '->render() translates the options');
 
 // choices are not translated if "translate_choices" is set to false
 $t->diag('choices are not translated if "translate_choices" is set to false');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormChoice(array('choices' => array('foo' => 'bar', 'foobar' => 'foo'), 'translate_choices' => false));
+$w = new \sfWidgetFormChoice(['choices' => ['foo' => 'bar', 'foobar' => 'foo'], 'translate_choices' => false]);
 $w->setParent($ws);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo option[value="foo"]')->getValue(), 'bar', '->render() translates the options');
 $t->is($css->matchSingle('#foo option[value="foobar"]')->getValue(), 'foo', '->render() translates the options');
 
 // ->getJavaScripts() ->getStylesheets()
 $t->diag('->getJavaScripts() ->getStylesheets()');
-$w = new sfWidgetFormChoice(array('choices' => array()));
+$w = new \sfWidgetFormChoice(['choices' => []]);
 $w->setOption('renderer_class', 'MyWidget');
-$t->is($w->getJavaScripts(), array('/path/to/a/file.js'), '->getJavaScripts() returns the stylesheets of the renderer widget');
-$t->is($w->getStylesheets(), array('/path/to/a/file.css' => 'all'), '->getStylesheets() returns the JavaScripts of the renderer widget');
+$t->is($w->getJavaScripts(), ['/path/to/a/file.js'], '->getJavaScripts() returns the stylesheets of the renderer widget');
+$t->is($w->getStylesheets(), ['/path/to/a/file.css' => 'all'], '->getStylesheets() returns the JavaScripts of the renderer widget');
 
 // __clone()
 $t->diag('__clone()');
-$w = new sfWidgetFormChoice(array('choices' => new sfCallable(array($w, 'foo'))));
+$w = new \sfWidgetFormChoice(['choices' => new \sfCallable([$w, 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($w1), '__clone() changes the choices is a callable and the object is an instance of the current object');
 
-$w = new sfWidgetFormChoice(array('choices' => new sfCallable(array($a = new stdClass(), 'foo'))));
+$w = new \sfWidgetFormChoice(['choices' => new \sfCallable([$a = new \stdClass(), 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($a), '__clone() changes nothing if the choices is a callable and the object is not an instance of the current object');
diff --git a/test/unit/widget/sfWidgetFormDateRangeTest.php b/test/unit/widget/sfWidgetFormDateRangeTest.php
index 5e273bdbb..b1e27f299 100644
--- a/test/unit/widget/sfWidgetFormDateRangeTest.php
+++ b/test/unit/widget/sfWidgetFormDateRangeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,15 +11,15 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterMock extends sfWidgetFormSchemaFormatter
+class FormFormatterMock extends \sfWidgetFormSchemaFormatter
 {
-    public $translateSubjects = array();
+    public $translateSubjects = [];
 
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         $this->translateSubjects[] = $subject;
 
@@ -26,27 +27,27 @@ public function translate($subject, $parameters = array())
     }
 }
 
-class WidgetFormStub extends sfWidget
+class WidgetFormStub extends \sfWidget
 {
     public function __construct()
     {
     }
 
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return sprintf('##%s##', __CLASS__);
     }
 }
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
 // ->render()
 $t->diag('->render()');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', $formatter = new FormFormatterMock());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', $formatter = new \FormFormatterMock());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormDateRange(array('from_date' => new WidgetFormStub(), 'to_date' => new WidgetFormStub()));
+$w = new \sfWidgetFormDateRange(['from_date' => new \WidgetFormStub(), 'to_date' => new \WidgetFormStub()]);
 $w->setParent($ws);
 $t->is($w->render('foo'), 'translation[from ##WidgetFormStub## to ##WidgetFormStub##]', '->render() remplaces %from_date% and %to_date%');
-$t->is($formatter->translateSubjects, array('from %from_date% to %to_date%'), '->render() translates the template option');
+$t->is($formatter->translateSubjects, ['from %from_date% to %to_date%'], '->render() translates the template option');
diff --git a/test/unit/widget/sfWidgetFormDateTest.php b/test/unit/widget/sfWidgetFormDateTest.php
index bd4dd4f4f..184bd4746 100644
--- a/test/unit/widget/sfWidgetFormDateTest.php
+++ b/test/unit/widget/sfWidgetFormDateTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,23 +13,23 @@
 
 $year = date('Y');
 
-$t = new lime_test(43);
+$t = new \lime_test(43);
 
-$w = new sfWidgetFormDate();
+$w = new \sfWidgetFormDate();
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
 
-foreach (array(
-    $year.'-10-15' => array('year' => $year, 'month' => 10, 'day' => 15),
-    time() => array('year' => date('Y'), 'month' => date('m'), 'day' => date('d')),
-    'tomorrow' => array('year' => date('Y', time() + 86400), 'month' => date('m', time() + 86400), 'day' => date('d', time() + 86400)),
-) as $date => $values) {
+foreach ([
+    $year.'-10-15' => ['year' => $year, 'month' => 10, 'day' => 15],
+    time() => ['year' => date('Y'), 'month' => date('m'), 'day' => date('d')],
+    'tomorrow' => ['year' => date('Y', time() + 86400), 'month' => date('m', time() + 86400), 'day' => date('d', time() + 86400)],
+] as $date => $values) {
     $dom->loadHTML($w->render('foo', $date));
-    $css = new sfDomCssSelector($dom);
+    $css = new \sfDomCssSelector($dom);
 
     // selected date
     $t->is($css->matchSingle('#foo_year option[value="'.$values['year'].'"][selected="selected"]')->getValue(), $values['year'], '->render() renders a select tag for the year');
@@ -39,9 +40,9 @@
 // pre-epoch date
 $t->diag('pre-epoch date');
 $years = range(1901, 1920);
-$w1 = new sfWidgetFormDate(array('years' => array_combine($years, $years)));
+$w1 = new \sfWidgetFormDate(['years' => array_combine($years, $years)]);
 $dom->loadHTML($w1->render('foo', '1910-01-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 
 $t->is($css->matchSingle('#foo_year option[selected="selected"]')->getValue(), '1910', '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[selected="selected"]')->getValue(), '01', '->render() renders a select tag for the month');
@@ -49,23 +50,23 @@
 
 // date as an array
 $t->diag('date as an array');
-$values = array('year' => $year, 'month' => 10, 'day' => 15);
+$values = ['year' => $year, 'month' => 10, 'day' => 15];
 $dom->loadHTML($w->render('foo', $values));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option[value="'.$values['year'].'"][selected="selected"]')->getValue(), $values['year'], '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[value="'.$values['month'].'"][selected="selected"]')->getValue(), $values['month'], '->render() renders a select tag for the month');
 $t->is($css->matchSingle('#foo_day option[value="'.$values['day'].'"][selected="selected"]')->getValue(), $values['day'], '->render() renders a select tag for the day');
 
 // invalid date
 $t->diag('invalid date');
-$dom->loadHTML($w->render('foo', array('year' => null, 'month' => 10)));
-$css = new sfDomCssSelector($dom);
+$dom->loadHTML($w->render('foo', ['year' => null, 'month' => 10]));
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[selected="selected"]')->getValue(), 10, '->render() renders a select tag for the month');
 $t->is($css->matchSingle('#foo_day option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the day');
 
 $dom->loadHTML($w->render('foo', 'invaliddate'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the month');
 $t->is($css->matchSingle('#foo_day option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the day');
@@ -73,7 +74,7 @@
 // number of options in each select
 $t->diag('number of options in each select');
 $dom->loadHTML($w->render('foo', $year.'-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_year option')->getNodes()), 12, '->render() renders a select tag for the 10 years around the current one');
 $t->is(count($css->matchAll('#foo_month option')->getNodes()), 13, '->render() renders a select tag for the 12 months in a year');
 $t->is(count($css->matchAll('#foo_day option')->getNodes()), 32, '->render() renders a select tag for the 31 days in a month');
@@ -82,7 +83,7 @@
 $t->diag('can_be_empty option');
 $w->setOption('can_be_empty', false);
 $dom->loadHTML($w->render('foo', $year.'-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_year option')->getNodes()), 11, '->render() renders a select tag for the 10 years around the current one');
 $t->is(count($css->matchAll('#foo_month option')->getNodes()), 12, '->render() renders a select tag for the 12 months in a year');
 $t->is(count($css->matchAll('#foo_day option')->getNodes()), 31, '->render() renders a select tag for the 31 days in a month');
@@ -90,13 +91,13 @@
 
 // empty_values
 $t->diag('empty_values option');
-$w->setOption('empty_values', array('year' => 'YEAR', 'month' => 'MONTH', 'day' => 'DAY'));
+$w->setOption('empty_values', ['year' => 'YEAR', 'month' => 'MONTH', 'day' => 'DAY']);
 $dom->loadHTML($w->render('foo', $year.'-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option')->getNode()->nodeValue, 'YEAR', '->configure() can change the empty values');
 $t->is($css->matchSingle('#foo_month option')->getNode()->nodeValue, 'MONTH', '->configure() can change the empty values');
 $t->is($css->matchSingle('#foo_day option')->getNode()->nodeValue, 'DAY', '->configure() can change the empty values');
-$w->setOption('empty_values', array('year' => '', 'month' => '', 'day' => ''));
+$w->setOption('empty_values', ['year' => '', 'month' => '', 'day' => '']);
 
 // format option
 $t->diag('format option');
@@ -105,29 +106,29 @@
 
 $w->setOption('format', '%month%#%day%#%year%');
 $dom->loadHTML($w->render('foo', $year.'-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_day')->getNode()->nextSibling->nodeValue, '#', '__construct() can change the default date format');
 $t->like($css->matchSingle('#foo_month')->getNode()->nextSibling->nodeValue, '/^#/', '__construct() can change the default date format');
 
 $w->setOption('format', '%day%/%month%/%year%');
 $dom->loadHTML($w->render('foo', $year.'-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('select')->getNode()->getAttribute('name'), 'foo[day]', '__construct() can change the default date format');
 
 // days / months / years options
 $t->diag('days / months / years options');
-$w->setOption('years', array(1998 => 1998, 1999 => 1999, 2000 => 2000, 2001 => 2001));
-$w->setOption('months', array(1 => 1, 2 => 2, 3 => 3));
-$w->setOption('days', array(1 => 1, 2 => 2));
+$w->setOption('years', [1998 => 1998, 1999 => 1999, 2000 => 2000, 2001 => 2001]);
+$w->setOption('months', [1 => 1, 2 => 2, 3 => 3]);
+$w->setOption('days', [1 => 1, 2 => 2]);
 $dom->loadHTML($w->render('foo', $year.'-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_year option')->getNodes()), 5, '__construct() can change the default array used for years');
 $t->is(count($css->matchAll('#foo_month option')->getNodes()), 4, '__construct() can change the default array used for months');
 $t->is(count($css->matchAll('#foo_day option')->getNodes()), 3, '__construct() can change the default array used for days');
 
 // attributes
 $t->diag('attributes');
-$dom->loadHTML($w->render('foo', $year.'-10-15', array('disabled' => 'disabled')));
+$dom->loadHTML($w->render('foo', $year.'-10-15', ['disabled' => 'disabled']));
 $t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 3, '->render() takes the attributes into account for all the three embedded widgets');
 
 $w->setAttribute('disabled', 'disabled');
diff --git a/test/unit/widget/sfWidgetFormDateTimeTest.php b/test/unit/widget/sfWidgetFormDateTimeTest.php
index 5143de336..5ac5a868a 100644
--- a/test/unit/widget/sfWidgetFormDateTimeTest.php
+++ b/test/unit/widget/sfWidgetFormDateTimeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,23 +13,23 @@
 
 $year = date('Y');
 
-$t = new lime_test(64);
+$t = new \lime_test(64);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
-$w = new sfWidgetFormDateTime(array('with_time' => true, 'time' => array('with_seconds' => true)));
+$w = new \sfWidgetFormDateTime(['with_time' => true, 'time' => ['with_seconds' => true]]);
 
 // ->render()
 $t->diag('->render()');
 
-foreach (array(
-    $year.'-10-15 12:30:35' => array('year' => $year, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 30, 'second' => 35),
-    time() => array('year' => date('Y'), 'month' => date('m'), 'day' => date('d'), 'hour' => date('G'), 'minute' => date('i'), 'second' => date('s')),
-    'tomorrow 12:30:35' => array('year' => date('Y', time() + 86400), 'month' => date('m', time() + 86400), 'day' => date('d', time() + 86400), 'hour' => 12, 'minute' => 30, 'second' => 35),
-) as $date => $values) {
+foreach ([
+    $year.'-10-15 12:30:35' => ['year' => $year, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 30, 'second' => 35],
+    time() => ['year' => date('Y'), 'month' => date('m'), 'day' => date('d'), 'hour' => date('G'), 'minute' => date('i'), 'second' => date('s')],
+    'tomorrow 12:30:35' => ['year' => date('Y', time() + 86400), 'month' => date('m', time() + 86400), 'day' => date('d', time() + 86400), 'hour' => 12, 'minute' => 30, 'second' => 35],
+] as $date => $values) {
     $dom->loadHTML($w->render('foo', $date));
-    $css = new sfDomCssSelector($dom);
+    $css = new \sfDomCssSelector($dom);
 
     // selected date / time
     $t->is($css->matchSingle('#foo_year option[value="'.$values['year'].'"][selected="selected"]')->getValue(), $values['year'], '->render() renders a select tag for the year');
@@ -41,9 +42,9 @@
 
 // selected date / time
 $t->diag('selected date / time');
-$values = array('year' => $year, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 30, 'second' => 35);
+$values = ['year' => $year, 'month' => 10, 'day' => 15, 'hour' => 12, 'minute' => 30, 'second' => 35];
 $dom->loadHTML($w->render('foo', $values));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option[value="'.$values['year'].'"][selected="selected"]')->getValue(), $values['year'], '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[value="'.$values['month'].'"][selected="selected"]')->getValue(), $values['month'], '->render() renders a select tag for the month');
 $t->is($css->matchSingle('#foo_day option[value="'.$values['day'].'"][selected="selected"]')->getValue(), $values['day'], '->render() renders a select tag for the day');
@@ -53,9 +54,9 @@
 
 // invalid date / time
 $t->diag('invalid date / time');
-$values = array('year' => null, 'month' => 10, 'hour' => null, 'minute' => 30);
+$values = ['year' => null, 'month' => 10, 'hour' => null, 'minute' => 30];
 $dom->loadHTML($w->render('foo', $values));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[value="'.$values['month'].'"][selected="selected"]')->getValue(), $values['month'], '->render() renders a select tag for the month');
 $t->is($css->matchSingle('#foo_day option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the day');
@@ -64,7 +65,7 @@
 $t->is($css->matchSingle('#foo_second option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the second');
 
 $dom->loadHTML($w->render('foo', 'invaliddatetime'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_year option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the year');
 $t->is($css->matchSingle('#foo_month option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the month');
 $t->is($css->matchSingle('#foo_day option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the day');
@@ -75,7 +76,7 @@
 // number of options in each select
 $t->diag('number of options in each select');
 $dom->loadHTML($w->render('foo', $year.'-10-15 12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_year option')->getNodes()), 12, '->render() renders a select tag for the 10 years around the current one');
 $t->is(count($css->matchAll('#foo_month option')->getNodes()), 13, '->render() renders a select tag for the 12 months in a year');
 $t->is(count($css->matchAll('#foo_day option')->getNodes()), 32, '->render() renders a select tag for the 31 days in a month');
@@ -91,10 +92,10 @@
 $t->is($css->matchSingle('#foo_minute')->getNode()->nextSibling->nodeValue, ':', '->render() renders 3 selects with a default : as a format');
 
 $t->diag('change date and time format option');
-$w->setOption('date', array('format' => '%month%-%day%-%year%'));
-$w->setOption('time', array('format' => '%hour%!%minute%!%second%', 'with_seconds' => true));
+$w->setOption('date', ['format' => '%month%-%day%-%year%']);
+$w->setOption('time', ['format' => '%hour%!%minute%!%second%', 'with_seconds' => true]);
 $dom->loadHTML($w->render('foo', $year.'-10-15 12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_day')->getNode()->nextSibling->nodeValue, '-', '__construct() can change the default format');
 $t->like($css->matchSingle('#foo_month')->getNode()->nextSibling->nodeValue, '/^-/', '__construct() can change the default format');
 $t->is($css->matchSingle('#foo_hour')->getNode()->nextSibling->nodeValue, '!', '__construct() can change the default format');
@@ -103,36 +104,36 @@
 // with_time option
 $t->diag('with_time option');
 
-$w = new sfWidgetFormDateTime(array('with_time' => false));
+$w = new \sfWidgetFormDateTime(['with_time' => false]);
 $dom->loadHTML($w->render('foo', $year.'-10-15 12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_hour')->getNodes()), 0, '->render() does not render the time if the with_time option is disabled');
 
 // date and time options as array
 $t->diag('date and time options as array');
-$w = new sfWidgetFormDateTime(array('date' => 'a string'));
+$w = new \sfWidgetFormDateTime(['date' => 'a string']);
 
 try {
     $w->render('foo');
     $t->fail('__construct() throws a InvalidArgumentException if the date/time options is not an array');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws a InvalidArgumentException if the date/time options is not an array');
 }
 
 // attributes
 $t->diag('attributes');
-$w = new sfWidgetFormDateTime();
-$dom->loadHTML($w->render('foo', $year.'-10-15 12:30:35', array('date' => array('disabled' => 'disabled'), 'time' => array('disabled' => 'disabled'))));
+$w = new \sfWidgetFormDateTime();
+$dom->loadHTML($w->render('foo', $year.'-10-15 12:30:35', ['date' => ['disabled' => 'disabled'], 'time' => ['disabled' => 'disabled']]));
 $t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 5, '->render() takes the attributes into account for all the five embedded widgets');
 
-$w->setAttribute('date', array('disabled' => 'disabled'));
-$w->setAttribute('time', array('disabled' => 'disabled'));
+$w->setAttribute('date', ['disabled' => 'disabled']);
+$w->setAttribute('time', ['disabled' => 'disabled']);
 $dom->loadHTML($w->render('foo', $year.'-10-15 12:30:35'));
 $t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 5, '->render() takes the attributes into account for all the five embedded widgets');
 
 // id_format
 $t->diag('id_format');
-$w = new sfWidgetFormDateTime();
+$w = new \sfWidgetFormDateTime();
 $w->setIdFormat('id_%s');
 $dom->loadHTML($w->render('foo'));
 $t->is(count($css->matchAll('#id_foo_month')), 1, '->render() month considers id_format');
@@ -141,8 +142,8 @@
 $t->is(count($css->matchAll('#id_foo_hour')), 1, '->render() hour considers id_format');
 $t->is(count($css->matchAll('#id_foo_minute')), 1, '->render() minute considers id_format');
 
-$w->setOption('date', array('id_format' => 'override_%s'));
-$w->setOption('time', array('id_format' => 'override_%s'));
+$w->setOption('date', ['id_format' => 'override_%s']);
+$w->setOption('time', ['id_format' => 'override_%s']);
 $dom->loadHTML($w->render('foo'));
 $t->is(count($css->matchAll('#override_foo_month')), 1, '->render() month does not override subwidget id_format');
 $t->is(count($css->matchAll('#override_foo_day')), 1, '->render() day does not override subwidget id_format');
diff --git a/test/unit/widget/sfWidgetFormFilterDateTest.php b/test/unit/widget/sfWidgetFormFilterDateTest.php
index 653fdad05..35c6c6426 100644
--- a/test/unit/widget/sfWidgetFormFilterDateTest.php
+++ b/test/unit/widget/sfWidgetFormFilterDateTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,43 +11,43 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-class WidgetFormStub extends sfWidget
+class WidgetFormStub extends \sfWidget
 {
     public function __construct()
     {
     }
 
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return sprintf('##%s##', __CLASS__);
     }
 }
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormFilterDate(array('from_date' => new WidgetFormStub(), 'to_date' => new WidgetFormStub()));
+$w = new \sfWidgetFormFilterDate(['from_date' => new \WidgetFormStub(), 'to_date' => new \WidgetFormStub()]);
 $w->setParent($ws);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('label[for="foo_is_empty"]')->getValue(), 'translation[is empty]', '->render() translates the empty_label option');
diff --git a/test/unit/widget/sfWidgetFormFilterInputTest.php b/test/unit/widget/sfWidgetFormFilterInputTest.php
index 0b2fbd7d5..e7421f966 100644
--- a/test/unit/widget/sfWidgetFormFilterInputTest.php
+++ b/test/unit/widget/sfWidgetFormFilterInputTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,31 +11,31 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormFilterInput();
+$w = new \sfWidgetFormFilterInput();
 $w->setParent($ws);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('label[for="foo_is_empty"]')->getValue(), 'translation[is empty]', '->render() translates the empty_label option');
diff --git a/test/unit/widget/sfWidgetFormInputCheckboxTest.php b/test/unit/widget/sfWidgetFormInputCheckboxTest.php
index e7e0c14a7..659dc5554 100644
--- a/test/unit/widget/sfWidgetFormInputCheckboxTest.php
+++ b/test/unit/widget/sfWidgetFormInputCheckboxTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,18 +11,18 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
-$w = new sfWidgetFormInputCheckbox();
+$w = new \sfWidgetFormInputCheckbox();
 
 // ->render()
 $t->diag('->render()');
 $t->is($w->render('foo', 1), '<input type="checkbox" name="foo" checked="checked" id="foo" />', '->render() renders the widget as HTML');
 $t->is($w->render('foo', null), '<input type="checkbox" name="foo" id="foo" />', '->render() renders the widget as HTML');
 $t->is($w->render('foo', false), '<input type="checkbox" name="foo" id="foo" />', '->render() renders the widget as HTML');
-$t->is($w->render('foo', 0, array('value' => '0')), '<input type="checkbox" name="foo" value="0" checked="checked" id="foo" />', '->render() renders the widget as HTML');
+$t->is($w->render('foo', 0, ['value' => '0']), '<input type="checkbox" name="foo" value="0" checked="checked" id="foo" />', '->render() renders the widget as HTML');
 
-$w = new sfWidgetFormInputCheckbox(array(), array('value' => 'bar'));
+$w = new \sfWidgetFormInputCheckbox([], ['value' => 'bar']);
 $t->is($w->render('foo', null), '<input value="bar" type="checkbox" name="foo" id="foo" />', '->render() renders the widget as HTML');
-$t->is($w->render('foo', null, array('value' => 'baz')), '<input value="baz" type="checkbox" name="foo" id="foo" />', '->render() renders the widget as HTML');
+$t->is($w->render('foo', null, ['value' => 'baz']), '<input value="baz" type="checkbox" name="foo" id="foo" />', '->render() renders the widget as HTML');
 $t->is($w->render('foo', 'bar'), '<input value="bar" type="checkbox" name="foo" checked="checked" id="foo" />', '->render() renders the widget as HTML');
diff --git a/test/unit/widget/sfWidgetFormInputFileEditableTest.php b/test/unit/widget/sfWidgetFormInputFileEditableTest.php
index 6978b74f4..9426049e0 100644
--- a/test/unit/widget/sfWidgetFormInputFileEditableTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileEditableTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,70 +11,70 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-$t = new lime_test(7);
+$t = new \lime_test(7);
 
 // ->render()
 $t->diag('->render()');
 
 try {
-    new sfWidgetFormInputFileEditable();
+    new \sfWidgetFormInputFileEditable();
     $t->fail('->render() throws an exception if you don\' pass a "file_src" option.');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('->render() throws an exception if you don\' pass a "file_src" option.');
 }
 
-$w = new sfWidgetFormInputFileEditable(array(
+$w = new \sfWidgetFormInputFileEditable([
     'file_src' => '-foo-',
-));
+]);
 
 $t->is($w->render('foo'), '-foo-<br /><input type="file" name="foo" id="foo" /><br /><input type="checkbox" name="foo_delete" id="foo_delete" /> <label for="foo_delete">remove the current file</label>', '->render() renders the widget as HTML');
 
 $t->diag('with_delete option');
-$w = new sfWidgetFormInputFileEditable(array(
+$w = new \sfWidgetFormInputFileEditable([
     'file_src' => '-foo-',
     'with_delete' => false,
-));
+]);
 $t->is($w->render('foo'), '-foo-<br /><input type="file" name="foo" id="foo" /><br /> ', '->render() renders the widget as HTML');
 
 $t->diag('delete_label option');
-$w = new sfWidgetFormInputFileEditable(array(
+$w = new \sfWidgetFormInputFileEditable([
     'file_src' => '-foo-',
     'delete_label' => 'delete',
-));
+]);
 $t->is($w->render('foo'), '-foo-<br /><input type="file" name="foo" id="foo" /><br /><input type="checkbox" name="foo_delete" id="foo_delete" /> <label for="foo_delete">delete</label>', '->render() renders the widget as HTML');
 
 $t->diag('delete label translation');
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormInputFileEditable(array(
+$w = new \sfWidgetFormInputFileEditable([
     'file_src' => '-foo-',
-));
+]);
 $w->setParent($ws);
 $t->is($w->render('foo'), '-foo-<br /><input type="file" name="foo" id="foo" /><br /><input type="checkbox" name="foo_delete" id="foo_delete" /> <label for="foo_delete">translation[remove the current file]</label>', '->render() renders the widget as HTML');
 
 $t->diag('is_image option');
-$w = new sfWidgetFormInputFileEditable(array(
+$w = new \sfWidgetFormInputFileEditable([
     'file_src' => '-foo-',
     'is_image' => true,
-));
+]);
 $t->is($w->render('foo'), '<img src="-foo-" /><br /><input type="file" name="foo" id="foo" /><br /><input type="checkbox" name="foo_delete" id="foo_delete" /> <label for="foo_delete">remove the current file</label>', '->render() renders the widget as HTML');
 
 $t->diag('template option');
-$w = new sfWidgetFormInputFileEditable(array(
+$w = new \sfWidgetFormInputFileEditable([
     'file_src' => '-foo-',
     'template' => '%input%',
-));
+]);
 $t->is($w->render('foo'), '<input type="file" name="foo" id="foo" />', '->render() renders the widget as HTML');
diff --git a/test/unit/widget/sfWidgetFormInputFileMultiTest.php b/test/unit/widget/sfWidgetFormInputFileMultiTest.php
index 666fc8abb..f3a408a7e 100644
--- a/test/unit/widget/sfWidgetFormInputFileMultiTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileMultiTest.php
@@ -1,10 +1,19 @@
 <?php
 
+/*
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$w = new sfWidgetFormInputFileMulti();
+$w = new \sfWidgetFormInputFileMulti();
 
 // ->render()
 $t->diag('->render() multiple file upload');
diff --git a/test/unit/widget/sfWidgetFormInputFileTest.php b/test/unit/widget/sfWidgetFormInputFileTest.php
index 5053c385c..8025f47f2 100644
--- a/test/unit/widget/sfWidgetFormInputFileTest.php
+++ b/test/unit/widget/sfWidgetFormInputFileTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$w = new sfWidgetFormInputFile();
+$w = new \sfWidgetFormInputFile();
 
 // ->render()
 $t->diag('->render()');
diff --git a/test/unit/widget/sfWidgetFormInputHiddenTest.php b/test/unit/widget/sfWidgetFormInputHiddenTest.php
index abbc2a6fe..a32fddc33 100644
--- a/test/unit/widget/sfWidgetFormInputHiddenTest.php
+++ b/test/unit/widget/sfWidgetFormInputHiddenTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$w = new sfWidgetFormInputHidden();
+$w = new \sfWidgetFormInputHidden();
 
 // ->render()
 $t->diag('->render()');
diff --git a/test/unit/widget/sfWidgetFormInputPasswordTest.php b/test/unit/widget/sfWidgetFormInputPasswordTest.php
index 07c5bf99e..b7993536b 100644
--- a/test/unit/widget/sfWidgetFormInputPasswordTest.php
+++ b/test/unit/widget/sfWidgetFormInputPasswordTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(3);
+$t = new \lime_test(3);
 
-$w = new sfWidgetFormInputPassword();
+$w = new \sfWidgetFormInputPassword();
 
 // ->render()
 $t->diag('->render()');
diff --git a/test/unit/widget/sfWidgetFormInputReadTest.php b/test/unit/widget/sfWidgetFormInputReadTest.php
index f5702dc88..af5717711 100644
--- a/test/unit/widget/sfWidgetFormInputReadTest.php
+++ b/test/unit/widget/sfWidgetFormInputReadTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,19 +11,19 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(6);
+$t = new \lime_test(6);
 
-$w = new sfWidgetFormInputRead();
+$w = new \sfWidgetFormInputRead();
 
 // ->render()
 $t->diag('->render()');
 $t->is($w->render('foo'), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0;" />', '->render() renders the widget as HTML');
 $t->is($w->render('foo', 'bar'), '<input type="hidden" name="foo" value="bar" id="foo" /><input type="text" value="bar" readonly="readonly" style="border: 0;" />', '->render() can take a value for the input');
-$t->is($w->render('foo', '', array('class' => 'foobar', 'style' => 'width: 500px;')), '<input type="hidden" name="foo" value="" id="foo" /><input type="text" value="" readonly="readonly" style="border: 0; width: 500px;" class="foobar" />', '->render() can take HTML attributes as its third argument');
+$t->is($w->render('foo', '', ['class' => 'foobar', 'style' => 'width: 500px;']), '<input type="hidden" name="foo" value="" id="foo" /><input type="text" value="" readonly="readonly" style="border: 0; width: 500px;" class="foobar" />', '->render() can take HTML attributes as its third argument');
 
-$w = new sfWidgetFormInputRead(array('text' => 'Read text'));
+$w = new \sfWidgetFormInputRead(['text' => 'Read text']);
 $t->is($w->render('foo', 'bar'), '<input type="hidden" name="foo" value="bar" id="foo" /><input type="text" value="Read text" readonly="readonly" style="border: 0;" />', '->render() can take a value for the input and another value for read input');
 
-$w = new sfWidgetFormInputRead(array(), array('class' => 'foobar', 'style' => 'width: 500px;'));
+$w = new \sfWidgetFormInputRead([], ['class' => 'foobar', 'style' => 'width: 500px;']);
 $t->is($w->render('foo'), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0; width: 500px;" class="foobar" />', '__construct() can take default HTML attributes');
-$t->is($w->render('foo', null, array('class' => 'barfoo')), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0;" class="barfoo" />', '->render() can override default attributes');
+$t->is($w->render('foo', null, ['class' => 'barfoo']), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0;" class="barfoo" />', '->render() can override default attributes');
diff --git a/test/unit/widget/sfWidgetFormInputTextTest.php b/test/unit/widget/sfWidgetFormInputTextTest.php
index 8c59f4668..b156107db 100644
--- a/test/unit/widget/sfWidgetFormInputTextTest.php
+++ b/test/unit/widget/sfWidgetFormInputTextTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,16 +11,16 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(5);
+$t = new \lime_test(5);
 
-$w = new sfWidgetFormInputText();
+$w = new \sfWidgetFormInputText();
 
 // ->render()
 $t->diag('->render()');
 $t->is($w->render('foo'), '<input type="text" name="foo" id="foo" />', '->render() renders the widget as HTML');
 $t->is($w->render('foo', 'bar'), '<input type="text" name="foo" value="bar" id="foo" />', '->render() can take a value for the input');
-$t->is($w->render('foo', '', array('type' => 'password', 'class' => 'foobar')), '<input type="password" name="foo" value="" class="foobar" id="foo" />', '->render() can take HTML attributes as its third argument');
+$t->is($w->render('foo', '', ['type' => 'password', 'class' => 'foobar']), '<input type="password" name="foo" value="" class="foobar" id="foo" />', '->render() can take HTML attributes as its third argument');
 
-$w = new sfWidgetFormInputText(array(), array('class' => 'foobar'));
+$w = new \sfWidgetFormInputText([], ['class' => 'foobar']);
 $t->is($w->render('foo'), '<input class="foobar" type="text" name="foo" id="foo" />', '__construct() can take default HTML attributes');
-$t->is($w->render('foo', null, array('class' => 'barfoo')), '<input class="barfoo" type="text" name="foo" id="foo" />', '->render() can override default attributes');
+$t->is($w->render('foo', null, ['class' => 'barfoo']), '<input class="barfoo" type="text" name="foo" id="foo" />', '->render() can override default attributes');
diff --git a/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php b/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
index 50b52fc98..b49ae8d08 100644
--- a/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(16);
+$t = new \lime_test(16);
 
-$w1 = new sfWidgetFormInputText();
-$w2 = new sfWidgetFormInputText();
-$ws = new sfWidgetFormSchema(array('w1' => $w1));
+$w1 = new \sfWidgetFormInputText();
+$w2 = new \sfWidgetFormInputText();
+$ws = new \sfWidgetFormSchema(['w1' => $w1]);
 
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
+$w = new \sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
 
 // ->getWidget()
 $t->diag('->getWidget()');
@@ -39,29 +40,29 @@
 $w['w2'] = $w2;
 $w1->setParent($ws);
 $w2->setParent($ws);
-$t->ok($w->getFields() == array('w1' => $w1, 'w2' => $w2), 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
-$t->ok($ws->getFields() == array('w1' => $w1, 'w2' => $w2), 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
+$t->ok($w->getFields() == ['w1' => $w1, 'w2' => $w2], 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
+$t->ok($ws->getFields() == ['w1' => $w1, 'w2' => $w2], 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 
 try {
     $w['w1'] = 'string';
     $t->fail('sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 }
 
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
+$w = new \sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
 $t->is(isset($w['w1']), true, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->is(isset($w['w2']), true, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->is(isset($ws['w1']), true, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->is(isset($ws['w2']), true, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
+$w = new \sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
 $t->ok($w['w1'] == $w1, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->ok($w['w2'] == $w2, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->ok($ws['w1'] == $w1, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->ok($ws['w2'] == $w2, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 
-$w = new sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
+$w = new \sfWidgetFormSchemaDecorator($ws, "<table>\n%content%</table>");
 unset($w['w1']);
 $t->is($w['w1'], null, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
 $t->is($ws['w1'], null, 'sfWidgetFormSchemaDecorator implements the ArrayAccess interface for the fields');
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
index 041690bb7..a194d4f29 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$f = new sfWidgetFormSchemaFormatterList(new sfWidgetFormSchema());
+$f = new \sfWidgetFormSchemaFormatterList(new \sfWidgetFormSchema());
 
 // ->formatRow()
 $t->diag('->formatRow()');
@@ -23,7 +24,7 @@
 </li>
 
 EOF;
-$t->is($f->formatRow('label', '<input />', array(), 'help', ''), fix_linebreaks($output), '->formatRow() formats a field in a row');
+$t->is($f->formatRow('label', '<input />', [], 'help', ''), fix_linebreaks($output), '->formatRow() formats a field in a row');
 
 // ->formatErrorRow()
 $t->diag('->formatErrorRow()');
@@ -37,4 +38,4 @@
 </li>
 
 EOF;
-$t->is($f->formatErrorRow(array('Global error', 'id' => 'required', array('sub_id' => 'required'))), fix_linebreaks($output), '->formatErrorRow() formats an array of errors in a row');
+$t->is($f->formatErrorRow(['Global error', 'id' => 'required', ['sub_id' => 'required']]), fix_linebreaks($output), '->formatErrorRow() formats an array of errors in a row');
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
index 6361250c6..0b8e32748 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(2);
+$t = new \lime_test(2);
 
-$f = new sfWidgetFormSchemaFormatterTable(new sfWidgetFormSchema());
+$f = new \sfWidgetFormSchemaFormatterTable(new \sfWidgetFormSchema());
 
 // ->formatRow()
 $t->diag('->formatRow()');
@@ -23,7 +24,7 @@
 </tr>
 
 EOF;
-$t->is($f->formatRow('label', '<input />', array(), 'help', ''), fix_linebreaks($output), '->formatRow() formats a field in a row');
+$t->is($f->formatRow('label', '<input />', [], 'help', ''), fix_linebreaks($output), '->formatRow() formats a field in a row');
 
 // ->formatErrorRow()
 $t->diag('->formatErrorRow()');
@@ -37,4 +38,4 @@
 </td></tr>
 
 EOF;
-$t->is($f->formatErrorRow(array('Global error', 'id' => 'required', array('sub_id' => 'required'))), fix_linebreaks($output), '->formatErrorRow() formats an array of errors in a row');
+$t->is($f->formatErrorRow(['Global error', 'id' => 'required', ['sub_id' => 'required']]), fix_linebreaks($output), '->formatErrorRow() formats an array of errors in a row');
diff --git a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
index 398157797..80ec643d7 100644
--- a/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(28);
+$t = new \lime_test(28);
 
-class MyFormatter extends sfWidgetFormSchemaFormatter
+class MyFormatter extends \sfWidgetFormSchemaFormatter
 {
     protected $rowFormat = "<li>\n  %error%%label%\n  %field%%help%\n%hidden_fields%</li>\n";
     protected $errorRowFormat = "<li>\n%errors%</li>\n";
@@ -29,10 +30,10 @@ public static function dropTranslationCallable()
     }
 }
 
-$w1 = new sfWidgetFormInputText();
-$w2 = new sfWidgetFormInputText();
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
-$f = new MyFormatter($w);
+$w1 = new \sfWidgetFormInputText();
+$w2 = new \sfWidgetFormInputText();
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
+$f = new \MyFormatter($w);
 
 // ->formatRow()
 $t->diag('->formatRow()');
@@ -43,7 +44,7 @@ public static function dropTranslationCallable()
 </li>
 
 EOF;
-$t->is($f->formatRow('<label>label</label>', '<input />', array(), '<p>help</p>', ''), fix_linebreaks($output), '->formatRow() formats a field in a row');
+$t->is($f->formatRow('<label>label</label>', '<input />', [], '<p>help</p>', ''), fix_linebreaks($output), '->formatRow() formats a field in a row');
 
 // ->formatErrorRow()
 $t->diag('->formatErrorRow()');
@@ -57,18 +58,18 @@ public static function dropTranslationCallable()
 </li>
 
 EOF;
-$t->is($f->formatErrorRow(array('Global error', 'id' => 'required', array('sub_id' => 'required'))), fix_linebreaks($output), '->formatErrorRow() formats an array of errors in a row');
+$t->is($f->formatErrorRow(['Global error', 'id' => 'required', ['sub_id' => 'required']]), fix_linebreaks($output), '->formatErrorRow() formats an array of errors in a row');
 
 // ->unnestErrors()
 $t->diag('->unnestErrors()');
 $f->setErrorRowFormatInARow('<li>%error%</li>');
 $f->setNamedErrorRowFormatInARow('<li>%name%: %error%</li>');
-$errors = array('foo', 'bar', 'foobar' => 'foobar');
-$t->is($f->unnestErrors($errors), array('<li>foo</li>', '<li>bar</li>', '<li>foobar: foobar</li>'), '->unnestErrors() returns an array of formatted errors');
-$errors = array('foo', 'bar' => array('foo', 'foobar' => 'foobar'));
-$t->is($f->unnestErrors($errors), array('<li>foo</li>', '<li>foo</li>', '<li>bar > foobar: foobar</li>'), '->unnestErrors() unnests errors');
+$errors = ['foo', 'bar', 'foobar' => 'foobar'];
+$t->is($f->unnestErrors($errors), ['<li>foo</li>', '<li>bar</li>', '<li>foobar: foobar</li>'], '->unnestErrors() returns an array of formatted errors');
+$errors = ['foo', 'bar' => ['foo', 'foobar' => 'foobar']];
+$t->is($f->unnestErrors($errors), ['<li>foo</li>', '<li>foo</li>', '<li>bar > foobar: foobar</li>'], '->unnestErrors() unnests errors');
 
-foreach (array('RowFormat', 'ErrorRowFormat', 'ErrorListFormatInARow', 'ErrorRowFormatInARow', 'NamedErrorRowFormatInARow', 'DecoratorFormat') as $method) {
+foreach (['RowFormat', 'ErrorRowFormat', 'ErrorListFormatInARow', 'ErrorRowFormatInARow', 'NamedErrorRowFormatInARow', 'DecoratorFormat'] as $method) {
     $getter = sprintf('get%s', $method);
     $setter = sprintf('set%s', $method);
     $t->diag(sprintf('->%s() ->%s()', $getter, $setter));
@@ -89,41 +90,41 @@ public static function __($string)
         return my__($string);
     }
 }
-MyFormatter::setTranslationCallable('my__');
+\MyFormatter::setTranslationCallable('my__');
 
-$t->is(MyFormatter::getTranslationCallable(), 'my__', 'get18nCallable() retrieves i18n callable correctly');
+$t->is(\MyFormatter::getTranslationCallable(), 'my__', 'get18nCallable() retrieves i18n callable correctly');
 
-MyFormatter::setTranslationCallable(new sfCallable('my__'));
-$t->isa_ok(MyFormatter::getTranslationCallable(), 'sfCallable', 'get18nCallable() retrieves i18n sfCallable correctly');
+\MyFormatter::setTranslationCallable(new \sfCallable('my__'));
+$t->isa_ok(\MyFormatter::getTranslationCallable(), 'sfCallable', 'get18nCallable() retrieves i18n sfCallable correctly');
 
 try {
     $f->setTranslationCallable('foo');
     $t->fail('setTranslationCallable() does not throw InvalidException when i18n callable is invalid');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('setTranslationCallable() throws InvalidException if i18n callable is not a valid callable');
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $t->fail('setTranslationCallable() throws unexpected exception');
 }
 
 $t->diag('->translate()');
-$f = new MyFormatter(new sfWidgetFormSchema());
+$f = new \MyFormatter(new \sfWidgetFormSchema());
 $t->is($f->translate('label'), '[label]', 'translate() call i18n sfCallable as expected');
 
-MyFormatter::setTranslationCallable(array('myI18n', '__'));
+\MyFormatter::setTranslationCallable(['myI18n', '__']);
 $t->is($f->translate('label'), '[label]', 'translate() call i18n callable as expected');
 
 $t->diag('->generateLabel() ->generateLabelName() ->setLabel() ->setLabels()');
-MyFormatter::dropTranslationCallable();
-$w = new sfWidgetFormSchema(array(
-    'author_id' => new sfWidgetFormInputText(),
-    'first_name' => new sfWidgetFormInputText(),
-    'last_name' => new sfWidgetFormInputText(),
-));
-$f = new MyFormatter($w);
+\MyFormatter::dropTranslationCallable();
+$w = new \sfWidgetFormSchema([
+    'author_id' => new \sfWidgetFormInputText(),
+    'first_name' => new \sfWidgetFormInputText(),
+    'last_name' => new \sfWidgetFormInputText(),
+]);
+$f = new \MyFormatter($w);
 $t->is($f->generateLabelName('first_name'), 'First name', '->generateLabelName() generates a label value from a label name');
 $t->is($f->generateLabelName('author_id'), 'Author', '->generateLabelName() removes _id from auto-generated labels');
 
-$w->setLabels(array('first_name' => 'The first name'));
+$w->setLabels(['first_name' => 'The first name']);
 $t->is($f->generateLabelName('first_name'), 'The first name', '->setLabels() changes all current labels');
 
 $w->setLabel('first_name', 'A first name');
@@ -134,28 +135,28 @@ public static function __($string)
 
 $w->setLabel('first_name', 'Your First Name');
 $t->is($f->generateLabel('first_name'), '<label for="first_name">Your First Name</label>', '->generateLabelName() returns a label tag');
-$t->is($f->generateLabel('first_name', array('class' => 'foo')), '<label class="foo" for="first_name">Your First Name</label>', '->generateLabelName() returns a label tag with optional HTML attributes');
-$t->is($f->generateLabel('first_name', array('for' => 'myid')), '<label for="myid">Your First Name</label>', '->generateLabelName() returns a label tag with specified for-id');
+$t->is($f->generateLabel('first_name', ['class' => 'foo']), '<label class="foo" for="first_name">Your First Name</label>', '->generateLabelName() returns a label tag with optional HTML attributes');
+$t->is($f->generateLabel('first_name', ['for' => 'myid']), '<label for="myid">Your First Name</label>', '->generateLabelName() returns a label tag with specified for-id');
 
 $w->setLabel('last_name', 'Your Last Name');
 $t->is($f->generateLabel('last_name'), '<label for="last_name">Your Last Name</label>', '->generateLabelName() returns a label tag');
-MyFormatter::setTranslationCallable('my__');
+\MyFormatter::setTranslationCallable('my__');
 $t->is($f->generateLabel('last_name'), '<label for="last_name">[Your Last Name]</label>', '->generateLabelName() returns a i18ned label tag');
 
 // ->setTranslationCatalogue() ->getTranslationCatalogue()
-class MyFormatter2 extends sfWidgetFormSchemaFormatter
+class MyFormatter2 extends \sfWidgetFormSchemaFormatter
 {
 }
 
-$f = new MyFormatter2(new sfWidgetFormSchema(array()));
+$f = new \MyFormatter2(new \sfWidgetFormSchema([]));
 $f->setTranslationCatalogue('foo');
 $t->is($f->getTranslationCatalogue(), 'foo', 'setTranslationCatalogue() has set the i18n catalogue correctly');
 $t->diag('->setTranslationCatalogue() ->getTranslationCatalogue()');
 
 try {
-    $f->setTranslationCatalogue(array('foo'));
+    $f->setTranslationCatalogue(['foo']);
     $t->fail('setTranslationCatalogue() does not throw an exception when catalogue name is incorrectly typed');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('setTranslationCatalogue() throws an exception when catalogue name is incorrectly typed');
 }
 
@@ -164,7 +165,7 @@ function ___my($s, $p, $c)
     return $c;
 }
 
-$f = new MyFormatter2(new sfWidgetFormSchema());
+$f = new \MyFormatter2(new \sfWidgetFormSchema());
 $f->setTranslationCallable('___my');
 $f->setTranslationCatalogue('bar');
-$t->is($f->translate('foo', array()), 'bar', 'translate() passes back the catalogue to the translation callable');
+$t->is($f->translate('foo', []), 'bar', 'translate() passes back the catalogue to the translation callable');
diff --git a/test/unit/widget/sfWidgetFormSchemaTest.php b/test/unit/widget/sfWidgetFormSchemaTest.php
index 54c393ba3..600acc147 100644
--- a/test/unit/widget/sfWidgetFormSchemaTest.php
+++ b/test/unit/widget/sfWidgetFormSchemaTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,86 +11,86 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(95);
+$t = new \lime_test(95);
 
-$w1 = new sfWidgetFormInputText(array(), array('class' => 'foo1'));
-$w2 = new sfWidgetFormInputText();
+$w1 = new \sfWidgetFormInputText([], ['class' => 'foo1']);
+$w2 = new \sfWidgetFormInputText();
 
 // __construct()
 $t->diag('__construct()');
-$w = new sfWidgetFormSchema();
-$t->is($w->getFields(), array(), '__construct() can take no argument');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$w = new \sfWidgetFormSchema();
+$t->is($w->getFields(), [], '__construct() can take no argument');
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
 $w1->setParent($w);
 $w2->setParent($w);
-$t->ok($w->getFields() == array('w1' => $w1, 'w2' => $w2), '__construct() can take an array of named sfWidget objects');
+$t->ok($w->getFields() == ['w1' => $w1, 'w2' => $w2], '__construct() can take an array of named sfWidget objects');
 
 try {
-    $w = new sfWidgetFormSchema('string');
+    $w = new \sfWidgetFormSchema('string');
     $t->fail('__construct() throws a exception when passing a non supported first argument');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an exception when passing a non supported first argument');
 }
 
 $t->is($w->getFormFormatterName(), 'table', '__construct() sets "form_formatter" option to "table" by default');
-$w = new sfWidgetFormSchema(array(), array('form_formatter' => 'list'));
+$w = new \sfWidgetFormSchema([], ['form_formatter' => 'list']);
 $t->is($w->getFormFormatterName(), 'list', '__construct() can override the default value for the "form_formatter" option');
 
 $t->is($w->getNameFormat(), '%s', '__construct() sets "name_format" option to "table" by default');
-$w = new sfWidgetFormSchema(array(), array('name_format' => 'name_%s'));
+$w = new \sfWidgetFormSchema([], ['name_format' => 'name_%s']);
 $t->is($w->getNameFormat(), 'name_%s', '__construct() can override the default value for the "name_format" option');
 
 // implements ArrayAccess
 $t->diag('implements ArrayAccess');
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $w['w1'] = $w1;
 $w['w2'] = $w2;
 $w1->setParent($w);
 $w2->setParent($w);
-$t->ok($w->getFields() == array('w1' => $w1, 'w2' => $w2), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->ok($w->getFields() == ['w1' => $w1, 'w2' => $w2], '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 $t->is($w1->getParent(), $w, 'The widget schema is associated with the fields');
 $t->is($w2->getParent(), $w, 'The widget schema is associated with the fields');
 
 try {
     $w['w1'] = 'string';
     $t->fail('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 }
 
-$w = new sfWidgetFormSchema(array('w1' => $w1));
+$w = new \sfWidgetFormSchema(['w1' => $w1]);
 $t->is(isset($w['w1']), true, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 $t->is(isset($w['w2']), false, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
-$w = new sfWidgetFormSchema(array('w1' => $w1));
+$w = new \sfWidgetFormSchema(['w1' => $w1]);
 $w1->setParent($w);
 $w2->setParent($w);
 $t->ok($w['w1'] == $w1, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 $t->is($w['w2'], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
 unset($w['w1']);
 $t->is($w['w1'], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
-$t->is($w->getPositions(), array('w2'), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w->getPositions(), ['w2'], '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 // unset with numeric keys
-$w = new sfWidgetFormSchema(array('0' => $w1, 'w2' => $w2));
+$w = new \sfWidgetFormSchema(['0' => $w1, 'w2' => $w2]);
 unset($w['w2']);
 $t->is($w['w2'], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
-$t->is($w->getPositions(), array('0'), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w->getPositions(), ['0'], '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
-$w = new sfWidgetFormSchema(array('w1' => $w1, '0' => $w2));
+$w = new \sfWidgetFormSchema(['w1' => $w1, '0' => $w2]);
 unset($w[0]);
 $t->is($w[0], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
-$t->is($w->getPositions(), array('w1'), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w->getPositions(), ['w1'], '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 // ->addFormFormatter() ->setFormFormatterName() ->getFormFormatterName() ->getFormFormatter() ->getFormFormatters()
 $t->diag('->addFormFormatter() ->setFormFormatterName() ->getFormFormatterName() ->getFormFormatter() ->getFormFormatters()');
-$w = new sfWidgetFormSchema(array('w1' => $w1));
+$w = new \sfWidgetFormSchema(['w1' => $w1]);
 
 $t->is(get_class($w->getFormFormatter()), 'sfWidgetFormSchemaFormatterTable', '->getFormFormatter() returns a sfWidgetSchemaFormatter object');
 
-$w->addFormFormatter('custom', $customFormatter = new sfWidgetFormSchemaFormatterList($w));
+$w->addFormFormatter('custom', $customFormatter = new \sfWidgetFormSchemaFormatterList($w));
 $w->setFormFormatterName('custom');
 $t->is(get_class($w->getFormFormatter()), 'sfWidgetFormSchemaFormatterList', '->addFormFormatter() associates a name with a sfWidgetSchemaFormatter object');
 
@@ -101,17 +102,17 @@
 try {
     $w->getFormFormatter();
     $t->fail('->setFormFormatterName() throws a InvalidArgumentException when the form format name is not associated with a formatter');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setFormFormatterName() throws a InvalidArgumentException when the form format name is not associated with a formatter');
 }
 
 $formatterNames = array_keys($w->getFormFormatters());
 sort($formatterNames);
-$t->is($formatterNames, array('custom', 'list', 'table'), '->getFormFormatters() returns an array of all formatter for this widget schema');
+$t->is($formatterNames, ['custom', 'list', 'table'], '->getFormFormatters() returns an array of all formatter for this widget schema');
 
 // ->setNameFormat() ->getNameFormat() ->generateName()
 $t->diag('->setNameFormat() ->getNameFormat() ->generateName()');
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $t->is($w->generateName('foo'), 'foo', '->generateName() returns a HTML name attribute value for a given field name');
 $w->setNameFormat('article[%s]');
 $t->is($w->generateName('foo'), 'article[foo]', '->setNameFormat() changes the name format');
@@ -123,37 +124,37 @@
 try {
     $w->setNameFormat('foo');
     $t->fail('->setNameFormat() throws an InvalidArgumentException if the format does not contain %s');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setNameFormat() throws an InvalidArgumentException if the format does not contain %s');
 }
 
-$w = new sfWidgetFormSchema(array(
-    'author' => new sfWidgetFormSchema(array(
-        'first_name' => new sfWidgetFormInputText(),
-        'company' => new sfWidgetFormSchema(array(
-            'name' => new sfWidgetFormInputText(),
-        )),
-    )),
-));
+$w = new \sfWidgetFormSchema([
+    'author' => new \sfWidgetFormSchema([
+        'first_name' => new \sfWidgetFormInputText(),
+        'company' => new \sfWidgetFormSchema([
+            'name' => new \sfWidgetFormInputText(),
+        ]),
+    ]),
+]);
 $w->setNameFormat('article[%s]');
 $t->is($w['author']->generateName('first_name'), 'article[author][first_name]', '->generateName() returns a HTML name attribute value for a given field name');
 $t->is($w['author']['company']->generateName('name'), 'article[author][company][name]', '->generateName() returns a HTML name attribute value for a given field name');
 
 // ->getParent() ->setParent()
 $t->diag('->getParent() ->setParent()');
-$author = new sfWidgetFormSchema(array('first_name' => new sfWidgetFormInputText()));
-$company = new sfWidgetFormSchema(array('name' => new sfWidgetFormInputText()));
+$author = new \sfWidgetFormSchema(['first_name' => new \sfWidgetFormInputText()]);
+$company = new \sfWidgetFormSchema(['name' => new \sfWidgetFormInputText()]);
 $t->is($company->getParent(), null, '->getParent() returns null if there is no parent widget schema');
 $company->setParent($author);
 $t->is($company->getParent(), $author, '->getParent() returns the parent widget schema');
 
 // ->setLabels() ->setLabel() ->getLabels() ->getLabel() ->generateLabelName()
 $t->diag('->setLabels() ->setLabel() ->getLabels() ->getLabel() ->generateLabelName()');
-$w = new sfWidgetFormSchema(array('first_name' => new sfWidgetFormInputText()));
+$w = new \sfWidgetFormSchema(['first_name' => new \sfWidgetFormInputText()]);
 $w->setLabel('first_name', 'A first name');
-$t->is($w->getLabels(), array('first_name' => 'A first name'), '->getLabels() returns all current labels');
+$t->is($w->getLabels(), ['first_name' => 'A first name'], '->getLabels() returns all current labels');
 
-$w->setLabels(array('first_name' => 'The first name'));
+$w->setLabels(['first_name' => 'The first name']);
 $t->is($w->getFormFormatter()->generateLabelName('first_name'), 'The first name', '->setLabels() changes all current labels');
 
 $w->setLabel('first_name', 'A first name');
@@ -161,176 +162,176 @@
 
 // ->setHelps() ->getHelps() ->setHelp() ->getHelp()
 $t->diag('->setHelps() ->getHelps() ->setHelp() ->getHelp()');
-$w = new sfWidgetFormSchema();
-$w->setHelps(array('first_name', 'Please, provide your first name'));
-$t->is($w->getHelps(), array('first_name', 'Please, provide your first name'), '->setHelps() changes all help messages');
+$w = new \sfWidgetFormSchema();
+$w->setHelps(['first_name', 'Please, provide your first name']);
+$t->is($w->getHelps(), ['first_name', 'Please, provide your first name'], '->setHelps() changes all help messages');
 $w->setHelp('last_name', 'Please, provide your last name');
 $t->is($w->getHelp('last_name'), 'Please, provide your last name', '->setHelp() changes one help message');
 
 // ->getLabel() ->setLabel() ->getLabels() ->setLabels()
 $t->diag('->getLabel() ->setLabel() ->getLabels() ->setLabels()');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
-$w->setLabels(array('w1' => 'foo'));
-$t->is($w->getLabels(), array('w1' => 'foo', 'w2' => null), '->getLabels() returns the labels');
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
+$w->setLabels(['w1' => 'foo']);
+$t->is($w->getLabels(), ['w1' => 'foo', 'w2' => null], '->getLabels() returns the labels');
 $t->is($w->getLabel('w1'), 'foo', '->getLabel() returns the label for a given field');
 $w->setLabel('w2', 'foo');
-$t->is($w->getLabels(), array('w1' => 'foo', 'w2' => 'foo'), '->setLabel() sets a label for a given field');
+$t->is($w->getLabels(), ['w1' => 'foo', 'w2' => 'foo'], '->setLabel() sets a label for a given field');
 $w->setLabel('foo');
 $t->is($w->getLabel(), 'foo', '->setLabel() can also set the label for the widget schema');
 
 // ->getDefault() ->setDefault() ->getDefaults() ->setDefaults()
 $t->diag('->getDefault() ->setDefault() ->getDefaults() ->setDefaults()');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
-$w->setDefaults(array('w1' => 'foo'));
-$t->is($w->getDefaults(), array('w1' => 'foo', 'w2' => null), '->getDefaults() returns the default values');
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
+$w->setDefaults(['w1' => 'foo']);
+$t->is($w->getDefaults(), ['w1' => 'foo', 'w2' => null], '->getDefaults() returns the default values');
 $t->is($w->getDefault('w1'), 'foo', '->getDefault() returns the default value for a given field');
 $w->setDefault('w2', 'foo');
-$t->is($w->getDefaults(), array('w1' => 'foo', 'w2' => 'foo'), '->setDefault() sets a default value for a given field');
+$t->is($w->getDefaults(), ['w1' => 'foo', 'w2' => 'foo'], '->setDefault() sets a default value for a given field');
 
 // ->needsMultipartForm()
 $t->diag('->needsMultipartForm()');
-$w = new sfWidgetFormSchema(array('w1' => $w1));
+$w = new \sfWidgetFormSchema(['w1' => $w1]);
 $t->is($w->needsMultipartForm(), false, '->needsMultipartForm() returns false if the form schema does not have a widget that needs a multipart form');
-$w['w2'] = new sfWidgetFormInputFile();
+$w['w2'] = new \sfWidgetFormInputFile();
 $t->is($w->needsMultipartForm(), true, '->needsMultipartForm() returns true if the form schema does not have a widget that needs a multipart form');
 
 // ->renderField()
 $t->diag('->renderField()');
-$w = new sfWidgetFormSchema(array('first_name' => $w1));
+$w = new \sfWidgetFormSchema(['first_name' => $w1]);
 $t->is($w->renderField('first_name', 'Fabien'), '<input class="foo1" type="text" name="first_name" value="Fabien" id="first_name" />', '->renderField() renders a field to HTML');
 
 $ww = clone $w1;
 $ww->setAttribute('id', 'foo');
 $ww->setAttribute('style', 'color: blue');
-$w = new sfWidgetFormSchema(array('first_name' => $ww));
+$w = new \sfWidgetFormSchema(['first_name' => $ww]);
 $t->is($w->renderField('first_name', 'Fabien'), '<input class="foo1" id="foo" style="color: blue" type="text" name="first_name" value="Fabien" />', '->renderField() renders a field to HTML');
 
 try {
     $w->renderField('last_name', 'Potencier');
     $t->fail('->renderField() throws an InvalidArgumentException if the field does not exist');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->renderField() throws an InvalidArgumentException if the field does not exist');
 }
 
 // ->setPositions() ->getPositions()
 $t->diag('->setPositions() ->getPositions()');
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $w['w1'] = $w1;
 $w['w2'] = $w2;
-$w->setPositions(array('w2', 'w1'));
-$t->is($w->getPositions(), array('w2', 'w1'), '->setPositions() changes all field positions');
-$w->setPositions(array('w1', 'w2'));
-$t->is($w->getPositions(), array('w1', 'w2'), '->setPositions() changes all field positions');
+$w->setPositions(['w2', 'w1']);
+$t->is($w->getPositions(), ['w2', 'w1'], '->setPositions() changes all field positions');
+$w->setPositions(['w1', 'w2']);
+$t->is($w->getPositions(), ['w1', 'w2'], '->setPositions() changes all field positions');
 
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $w['w1'] = $w1;
 $w['w2'] = $w2;
 $w['w1'] = $w1;
-$t->is($w->getPositions(), array('w1', 'w2'), '->setPositions() changes all field positions');
+$t->is($w->getPositions(), ['w1', 'w2'], '->setPositions() changes all field positions');
 
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $w['w1'] = $w1;
 $w['w2'] = $w2;
-$w->setPositions(array('w1', 'w2', 'w1'));
-$t->is($w->getPositions(), array('w1', 'w2'), '->setPositions() does not repeat the fields');
+$w->setPositions(['w1', 'w2', 'w1']);
+$t->is($w->getPositions(), ['w1', 'w2'], '->setPositions() does not repeat the fields');
 
 try {
-    $w->setPositions(array('w1', 'w2', 'w3'));
+    $w->setPositions(['w1', 'w2', 'w3']);
     $t->fail('->setPositions() throws an InvalidArgumentException if you give it a non existant field name');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setPositions() throws an InvalidArgumentException if you give it a non existant field name');
 }
 
 try {
-    $w->setPositions(array('w1'));
+    $w->setPositions(['w1']);
     $t->fail('->setPositions() throws an InvalidArgumentException if you miss a field name');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setPositions() throws an InvalidArgumentException if you miss a field name');
 }
 
 // ->moveField()
 $t->diag('->moveField()');
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $w['w1'] = $w1;
 $w['w2'] = $w2;
 $w['w3'] = $w1;
 $w['w4'] = $w2;
-$w->moveField('w1', sfWidgetFormSchema::BEFORE, 'w3');
-$t->is($w->getPositions(), array('w2', 'w1', 'w3', 'w4'), '->moveField() can move a field before another one');
-$w->moveField('w1', sfWidgetFormSchema::LAST);
-$t->is($w->getPositions(), array('w2', 'w3', 'w4', 'w1'), '->moveField() can move a field to the end');
-$w->moveField('w1', sfWidgetFormSchema::FIRST);
-$t->is($w->getPositions(), array('w1', 'w2', 'w3', 'w4'), '->moveField() can move a field to the beginning');
-$w->moveField('w1', sfWidgetFormSchema::AFTER, 'w3');
-$t->is($w->getPositions(), array('w2', 'w3', 'w1', 'w4'), '->moveField() can move a field before another one');
+$w->moveField('w1', \sfWidgetFormSchema::BEFORE, 'w3');
+$t->is($w->getPositions(), ['w2', 'w1', 'w3', 'w4'], '->moveField() can move a field before another one');
+$w->moveField('w1', \sfWidgetFormSchema::LAST);
+$t->is($w->getPositions(), ['w2', 'w3', 'w4', 'w1'], '->moveField() can move a field to the end');
+$w->moveField('w1', \sfWidgetFormSchema::FIRST);
+$t->is($w->getPositions(), ['w1', 'w2', 'w3', 'w4'], '->moveField() can move a field to the beginning');
+$w->moveField('w1', \sfWidgetFormSchema::AFTER, 'w3');
+$t->is($w->getPositions(), ['w2', 'w3', 'w1', 'w4'], '->moveField() can move a field before another one');
 
 try {
-    $w->moveField('w1', sfWidgetFormSchema::AFTER);
+    $w->moveField('w1', \sfWidgetFormSchema::AFTER);
     $t->fail('->moveField() throws an LogicException if you don\'t pass a relative field name with AFTER');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->moveField() throws an LogicException if you don\'t pass a relative field name with AFTER');
 }
 
 try {
-    $w->moveField('w1', sfWidgetFormSchema::BEFORE);
+    $w->moveField('w1', \sfWidgetFormSchema::BEFORE);
     $t->fail('->moveField() throws an LogicException if you don\'t pass a relative field name with BEFORE');
-} catch (LogicException $e) {
+} catch (\LogicException $e) {
     $t->pass('->moveField() throws an LogicException if you don\'t pass a relative field name with BEFORE');
 }
 // this case is especially interesting because the numeric array keys are always
 // converted to integers by array
 // furthermore, (int)0 == (string)'w1' succeeds
-$w = new sfWidgetFormSchema(array('w1' => $w1, '0' => $w2));
-$w->moveField(0, sfWidgetFormSchema::FIRST);
-$t->is($w->getPositions(), array('0', 'w1'), '->moveField() compares field names as strings');
+$w = new \sfWidgetFormSchema(['w1' => $w1, '0' => $w2]);
+$w->moveField(0, \sfWidgetFormSchema::FIRST);
+$t->is($w->getPositions(), ['0', 'w1'], '->moveField() compares field names as strings');
 
-$w = new sfWidgetFormSchema(array('w1' => $w1, '0' => $w2));
-$w->moveField('0', sfWidgetFormSchema::FIRST);
-$t->is($w->getPositions(), array('0', 'w1'), '->moveField() compares field names as strings');
+$w = new \sfWidgetFormSchema(['w1' => $w1, '0' => $w2]);
+$w->moveField('0', \sfWidgetFormSchema::FIRST);
+$t->is($w->getPositions(), ['0', 'w1'], '->moveField() compares field names as strings');
 
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2, '0' => $w1));
-$w->moveField('w1', sfWidgetFormSchema::BEFORE, '0');
-$t->is($w->getPositions(), array('w2', 'w1', '0'), '->moveField() compares field names as strings');
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2, '0' => $w1]);
+$w->moveField('w1', \sfWidgetFormSchema::BEFORE, '0');
+$t->is($w->getPositions(), ['w2', 'w1', '0'], '->moveField() compares field names as strings');
 
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2, '0' => $w1));
-$w->moveField('w1', sfWidgetFormSchema::BEFORE, 0);
-$t->is($w->getPositions(), array('w2', 'w1', '0'), '->moveField() compares field names as strings');
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2, '0' => $w1]);
+$w->moveField('w1', \sfWidgetFormSchema::BEFORE, 0);
+$t->is($w->getPositions(), ['w2', 'w1', '0'], '->moveField() compares field names as strings');
 
 // ->getGlobalErrors()
 $t->diag('->getGlobalErrors()');
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 $w['w1'] = $w1;
-$w['w2'] = new sfWidgetFormInputHidden();
-$w['w3'] = new sfWidgetFormSchema();
+$w['w2'] = new \sfWidgetFormInputHidden();
+$w['w3'] = new \sfWidgetFormSchema();
 $w['w3']['w1'] = $w1;
-$w['w3']['w2'] = new sfWidgetFormInputHidden();
-$errors = array(
+$w['w3']['w2'] = new \sfWidgetFormInputHidden();
+$errors = [
     'global error',
     'w1' => 'error for w1',
     'w2' => 'error for w2',
-    'w4' => array(
+    'w4' => [
         'w1' => 'error for w4/w1',
         'w2' => 'error for w4/w2',
         'w3' => 'error for w4/w3',
-    ),
+    ],
     'w4' => 'error for w4',
-);
-$t->is($w->getGlobalErrors($errors), array('global error', 'error for w4', 'W2' => 'error for w2'), '->getGlobalErrors() returns an array of global errors, errors for hidden fields, and errors for non existent fields');
+];
+$t->is($w->getGlobalErrors($errors), ['global error', 'error for w4', 'W2' => 'error for w2'], '->getGlobalErrors() returns an array of global errors, errors for hidden fields, and errors for non existent fields');
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormSchema();
+$w = new \sfWidgetFormSchema();
 
 try {
     $w->render(null, 'string');
     $t->fail('->render() throws an InvalidArgumentException if the second argument is not an array');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->render() throws an InvalidArgumentException if the second argument is not an array');
 }
 
 $w['first_name'] = $w1;
 $w['last_name'] = $w2;
-$w['id'] = new sfWidgetFormInputHidden();
+$w['id'] = new \sfWidgetFormInputHidden();
 $w->setAttribute('style', 'padding: 5px');
 $w->setNameFormat('article[%s]');
 $w->setIdFormat('id_%s');
@@ -354,18 +355,18 @@
 </tr>
 
 EOF;
-$rendered = $w->render(null, array('first_name' => 'Fabien', 'last_name' => 'Potencier'), array('first_name' => array('class' => 'foo'), 'last_name' => array('class' => 'bar')), array('first_name' => 'Too short', 'Global error message', 'id' => 'Required'));
+$rendered = $w->render(null, ['first_name' => 'Fabien', 'last_name' => 'Potencier'], ['first_name' => ['class' => 'foo'], 'last_name' => ['class' => 'bar']], ['first_name' => 'Too short', 'Global error message', 'id' => 'Required']);
 $t->is($rendered, fix_linebreaks($expected), '->render() renders a schema to HTML');
 
 $t->diag('Widget schema with only hidden fields');
-$w = new sfWidgetFormSchema(array('w1' => new sfWidgetFormInputHidden()));
+$w = new \sfWidgetFormSchema(['w1' => new \sfWidgetFormInputHidden()]);
 $t->is($w->render(null), '<input type="hidden" name="w1" id="w1" />', '->render() is able to render widget schema that only contains hidden fields');
 
 $t->diag('Widget schema with an embed form as the last field and hidden fields');
-$w = new sfWidgetFormSchema();
-$w['w1'] = new sfWidgetFormInputHidden();
-$ew = new sfWidgetFormSchema(array('w3' => new sfWidgetFormInputText()));
-$w['w4'] = new sfWidgetFormSchemaDecorator($ew, $w->getFormFormatter()->getDecoratorFormat());
+$w = new \sfWidgetFormSchema();
+$w['w1'] = new \sfWidgetFormInputHidden();
+$ew = new \sfWidgetFormSchema(['w3' => new \sfWidgetFormInputText()]);
+$w['w4'] = new \sfWidgetFormSchemaDecorator($ew, $w->getFormFormatter()->getDecoratorFormat());
 $expected = <<<'EOF'
 <tr>
   <th>W4</th>
@@ -385,10 +386,10 @@
 
 // __clone()
 $t->diag('__clone()');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
 $w1->setParent($w);
 $w2->setParent($w);
-$format1 = new sfWidgetFormSchemaFormatterList($w);
+$format1 = new \sfWidgetFormSchemaFormatterList($w);
 $format1->setTranslationCatalogue('english');
 $w->addFormFormatter('testFormatter', $format1);
 $w1 = clone $w;
@@ -408,9 +409,9 @@
 $t->is(count($formatters), 1, '__clone() returns a sfWidgetFormSchema that has the Formatters attached');
 $t->is($formatters['testFormatter']->getTranslationCatalogue(), 'english', '__clone() clones formatters, so that changes to the original one have no effect to the cloned formatter.');
 
-$w = new sfWidgetFormSchema();
-$w->addFormFormatter('table', new sfWidgetFormSchemaFormatterTable($w));
-$w->addFormFormatter('list', new sfWidgetFormSchemaFormatterList($w));
+$w = new \sfWidgetFormSchema();
+$w->addFormFormatter('table', new \sfWidgetFormSchemaFormatterTable($w));
+$w->addFormFormatter('list', new \sfWidgetFormSchemaFormatterList($w));
 $w1 = clone $w;
 $f1 = $w1->getFormFormatters();
 $f = $w->getFormFormatters();
@@ -425,31 +426,31 @@
 
 // setDefaultFormFormatterName()
 $t->diag('setDefaultFormFormatterName()');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
 $t->isa_ok($w->getFormFormatter(), 'sfWidgetFormSchemaFormatterTable', 'setDefaultFormFormatterName() has the "sfWidgetFormSchemaFormatterTable" form formatter by default');
 
-sfWidgetFormSchema::setDefaultFormFormatterName('list');
-$w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
+\sfWidgetFormSchema::setDefaultFormFormatterName('list');
+$w = new \sfWidgetFormSchema(['w1' => $w1, 'w2' => $w2]);
 $t->isa_ok($w->getFormFormatter(), 'sfWidgetFormSchemaFormatterList', 'setDefaultFormFormatterName() changes the default form formatter name correctly');
 
-class MyWidget extends sfWidgetForm
+class MyWidget extends \sfWidgetForm
 {
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return null;
     }
 
     public function getJavaScripts()
     {
-        return array('/path/to/a/'.$this->getOption('name').'.js', '/path/to/foo.js');
+        return ['/path/to/a/'.$this->getOption('name').'.js', '/path/to/foo.js'];
     }
 
     public function getStylesheets()
     {
-        return array('/path/to/a/'.$this->getOption('name').'.css' => 'all', '/path/to/foo.css' => 'all');
+        return ['/path/to/a/'.$this->getOption('name').'.css' => 'all', '/path/to/foo.css' => 'all'];
     }
 
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('name');
     }
@@ -457,9 +458,9 @@ protected function configure($options = array(), $attributes = array())
 
 // ->getJavaScripts() ->getStylesheets()
 $t->diag('->getJavaScripts() ->getStylesheets()');
-$w = new sfWidgetFormSchema(array(
-    'foo' => new MyWidget(array('name' => 'foo')),
-    'bar' => new MyWidget(array('name' => 'bar')),
-));
-$t->is($w->getJavaScripts(), array('/path/to/a/foo.js', '/path/to/foo.js', '/path/to/a/bar.js'), '->getJavaScripts() returns an array of stylesheets');
-$t->is($w->getStylesheets(), array('/path/to/a/foo.css' => 'all', '/path/to/foo.css' => 'all', '/path/to/a/bar.css' => 'all'), '->getStylesheets() returns an array of JavaScripts');
+$w = new \sfWidgetFormSchema([
+    'foo' => new \MyWidget(['name' => 'foo']),
+    'bar' => new \MyWidget(['name' => 'bar']),
+]);
+$t->is($w->getJavaScripts(), ['/path/to/a/foo.js', '/path/to/foo.js', '/path/to/a/bar.js'], '->getJavaScripts() returns an array of stylesheets');
+$t->is($w->getStylesheets(), ['/path/to/a/foo.css' => 'all', '/path/to/foo.css' => 'all', '/path/to/a/bar.css' => 'all'], '->getStylesheets() returns an array of JavaScripts');
diff --git a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
index c0a0a6f89..545bf66fa 100644
--- a/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
+++ b/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,31 +11,31 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-$t = new lime_test(13);
+$t = new \lime_test(13);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array('foo' => 'bar', 'foobar' => 'foo'), 'separator' => ''));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => ['foo' => 'bar', 'foobar' => 'foo'], 'separator' => '']);
 $output = '<ul class="checkbox_list">'.
 '<li><input name="foo[]" type="checkbox" value="foo" id="foo_foo" />&nbsp;<label for="foo_foo">bar</label></li>'.
 '<li><input name="foo[]" type="checkbox" value="foobar" id="foo_foobar" checked="checked" />&nbsp;<label for="foo_foobar">foo</label></li>'.
 '</ul>';
-$t->is($w->render('foo', array('foobar')), $output, '->render() renders a checkbox tag with the value checked');
+$t->is($w->render('foo', ['foobar']), $output, '->render() renders a checkbox tag with the value checked');
 
 // attributes
 $onChange = '<ul class="checkbox_list">'.
@@ -43,46 +44,46 @@ public function translate($subject, $parameters = array())
 '<li><input name="foo[]" type="checkbox" value="foobar" id="foo_foobar" checked="checked" onChange="alert(42)" />'.
 '&nbsp;<label for="foo_foobar">foo</label></li>'.
 '</ul>';
-$t->is($w->render('foo', array('foobar'), array('onChange' => 'alert(42)')), $onChange, '->render() renders a checkbox tag using extra attributes');
+$t->is($w->render('foo', ['foobar'], ['onChange' => 'alert(42)']), $onChange, '->render() renders a checkbox tag using extra attributes');
 
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array('0' => 'bar', '1' => 'foo')));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => ['0' => 'bar', '1' => 'foo']]);
 $output = <<< 'EOF'
 <ul class="checkbox_list"><li><input name="myname[]" type="checkbox" value="0" id="myname_0" checked="checked" />&nbsp;<label for="myname_0">bar</label></li>
 <li><input name="myname[]" type="checkbox" value="1" id="myname_1" />&nbsp;<label for="myname_1">foo</label></li></ul>
 EOF;
-$t->is($w->render('myname', array(false)), fix_linebreaks($output), '->render() considers false to be an integer 0');
+$t->is($w->render('myname', [false]), fix_linebreaks($output), '->render() considers false to be an integer 0');
 
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array('0' => 'bar', '1' => 'foo')));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => ['0' => 'bar', '1' => 'foo']]);
 $output = <<< 'EOF'
 <ul class="checkbox_list"><li><input name="myname[]" type="checkbox" value="0" id="myname_0" />&nbsp;<label for="myname_0">bar</label></li>
 <li><input name="myname[]" type="checkbox" value="1" id="myname_1" checked="checked" />&nbsp;<label for="myname_1">foo</label></li></ul>
 EOF;
-$t->is($w->render('myname', array(true)), fix_linebreaks($output), '->render() considers true to be an integer 1');
+$t->is($w->render('myname', [true]), fix_linebreaks($output), '->render() considers true to be an integer 1');
 
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array()));
-$t->is($w->render('myname', array()), '', '->render() returns an empty HTML string if no choices');
+$w = new \sfWidgetFormSelectCheckbox(['choices' => []]);
+$t->is($w->render('myname', []), '', '->render() returns an empty HTML string if no choices');
 
 // group support
 $t->diag('group support');
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array('foo' => array('foo' => 'bar', 'bar' => 'foo'), 'bar' => array('foobar' => 'barfoo'))));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => ['foo' => ['foo' => 'bar', 'bar' => 'foo'], 'bar' => ['foobar' => 'barfoo']]]);
 $output = <<<'EOF'
 foo <ul class="checkbox_list"><li><input name="foo[]" type="checkbox" value="foo" id="foo_foo" checked="checked" />&nbsp;<label for="foo_foo">bar</label></li>
 <li><input name="foo[]" type="checkbox" value="bar" id="foo_bar" />&nbsp;<label for="foo_bar">foo</label></li></ul>
 bar <ul class="checkbox_list"><li><input name="foo[]" type="checkbox" value="foobar" id="foo_foobar" checked="checked" />&nbsp;<label for="foo_foobar">barfoo</label></li></ul>
 EOF;
-$t->is($w->render('foo', array('foo', 'foobar')), fix_linebreaks($output), '->render() has support for groups');
+$t->is($w->render('foo', ['foo', 'foobar']), fix_linebreaks($output), '->render() has support for groups');
 
-$w->setOption('choices', array('foo' => array('foo' => 'bar', 'bar' => 'foo')));
+$w->setOption('choices', ['foo' => ['foo' => 'bar', 'bar' => 'foo']]);
 $output = <<<'EOF'
 foo <ul class="checkbox_list"><li><input name="foo[]" type="checkbox" value="foo" id="foo_foo" />&nbsp;<label for="foo_foo">bar</label></li>
 <li><input name="foo[]" type="checkbox" value="bar" id="foo_bar" checked="checked" />&nbsp;<label for="foo_bar">foo</label></li></ul>
 EOF;
-$t->is($w->render('foo', array('bar')), fix_linebreaks($output), '->render() accepts a single group');
+$t->is($w->render('foo', ['bar']), fix_linebreaks($output), '->render() accepts a single group');
 
 try {
-    $w = new sfWidgetFormSelectCheckbox();
+    $w = new \sfWidgetFormSelectCheckbox();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
 }
 
@@ -91,20 +92,20 @@ public function translate($subject, $parameters = array())
 
 function choice_callable()
 {
-    return array(1, 2, 3);
+    return [1, 2, 3];
 }
-$w = new sfWidgetFormSelectCheckbox(array('choices' => new sfCallable('choice_callable')));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => new \sfCallable('choice_callable')]);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('input[type="checkbox"]')->getNodes()), 3, '->render() accepts a sfCallable as a choices option');
 
 // choices are translated
 $t->diag('choices are translated');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array('foo' => 'bar', 'foobar' => 'foo'), 'separator' => ''));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => ['foo' => 'bar', 'foobar' => 'foo'], 'separator' => '']);
 $w->setParent($ws);
 $output = '<ul class="checkbox_list">'.
 '<li><input name="foo[]" type="checkbox" value="foo" id="foo_foo" />&nbsp;<label for="foo_foo">translation[bar]</label></li>'.
@@ -115,17 +116,17 @@ function choice_callable()
 // choices are escaped
 $t->diag('choices are escaped');
 
-$w = new sfWidgetFormSelectCheckbox(array('choices' => array('<b>Hello world</b>')));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => ['<b>Hello world</b>']]);
 $t->is($w->render('foo'), '<ul class="checkbox_list"><li><input name="foo[]" type="checkbox" value="0" id="foo_0" />&nbsp;<label for="foo_0">&lt;b&gt;Hello world&lt;/b&gt;</label></li></ul>', '->render() escapes the choices');
 
 // __clone()
 $t->diag('__clone()');
-$w = new sfWidgetFormSelectCheckbox(array('choices' => new sfCallable(array($w, 'foo'))));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => new \sfCallable([$w, 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($w1), '__clone() changes the choices is a callable and the object is an instance of the current object');
 
-$w = new sfWidgetFormSelectCheckbox(array('choices' => new sfCallable(array($a = new stdClass(), 'foo'))));
+$w = new \sfWidgetFormSelectCheckbox(['choices' => new \sfCallable([$a = new \stdClass(), 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($a), '__clone() changes nothing if the choices is a callable and the object is not an instance of the current object');
diff --git a/test/unit/widget/sfWidgetFormSelectManyTest.php b/test/unit/widget/sfWidgetFormSelectManyTest.php
index 2290a4bd7..9964e824e 100644
--- a/test/unit/widget/sfWidgetFormSelectManyTest.php
+++ b/test/unit/widget/sfWidgetFormSelectManyTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(1);
+$t = new \lime_test(1);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormSelectMany(array('choices' => array('foo' => 'bar', 'foobar' => 'foo')));
+$w = new \sfWidgetFormSelectMany(['choices' => ['foo' => 'bar', 'foobar' => 'foo']]);
 $t->is($w->getOption('multiple'), true, '__construct() creates a multiple select tag');
diff --git a/test/unit/widget/sfWidgetFormSelectRadioTest.php b/test/unit/widget/sfWidgetFormSelectRadioTest.php
index cc2a4d710..9e3729d20 100644
--- a/test/unit/widget/sfWidgetFormSelectRadioTest.php
+++ b/test/unit/widget/sfWidgetFormSelectRadioTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,26 +11,26 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-$t = new lime_test(12);
+$t = new \lime_test(12);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormSelectRadio(array('choices' => array('foo' => 'bar', 'foobar' => 'foo'), 'separator' => ''));
+$w = new \sfWidgetFormSelectRadio(['choices' => ['foo' => 'bar', 'foobar' => 'foo'], 'separator' => '']);
 $output = '<ul class="radio_list">'.
 '<li><input name="foo" type="radio" value="foo" id="foo_foo" />&nbsp;<label for="foo_foo">bar</label></li>'.
 '<li><input name="foo" type="radio" value="foobar" id="foo_foobar" checked="checked" />&nbsp;<label for="foo_foobar">foo</label></li>'.
@@ -43,28 +44,28 @@ public function translate($subject, $parameters = array())
 '<li><input name="foo" type="radio" value="foobar" id="foo_foobar" checked="checked" onChange="alert(42)" />'.
 '&nbsp;<label for="foo_foobar">foo</label></li>'.
 '</ul>';
-$t->is($w->render('foo', 'foobar', array('onChange' => 'alert(42)')), $onChange, '->render() renders a radio tag using extra attributes');
+$t->is($w->render('foo', 'foobar', ['onChange' => 'alert(42)']), $onChange, '->render() renders a radio tag using extra attributes');
 
-$w = new sfWidgetFormSelectRadio(array('choices' => array('0' => 'bar', '1' => 'foo')));
+$w = new \sfWidgetFormSelectRadio(['choices' => ['0' => 'bar', '1' => 'foo']]);
 $output = <<< 'EOF'
 <ul class="radio_list"><li><input name="myname" type="radio" value="0" id="myname_0" checked="checked" />&nbsp;<label for="myname_0">bar</label></li>
 <li><input name="myname" type="radio" value="1" id="myname_1" />&nbsp;<label for="myname_1">foo</label></li></ul>
 EOF;
 $t->is($w->render('myname', false), fix_linebreaks($output), '->render() considers false to be an integer 0');
 
-$w = new sfWidgetFormSelectRadio(array('choices' => array('0' => 'bar', '1' => 'foo')));
+$w = new \sfWidgetFormSelectRadio(['choices' => ['0' => 'bar', '1' => 'foo']]);
 $output = <<< 'EOF'
 <ul class="radio_list"><li><input name="myname" type="radio" value="0" id="myname_0" />&nbsp;<label for="myname_0">bar</label></li>
 <li><input name="myname" type="radio" value="1" id="myname_1" checked="checked" />&nbsp;<label for="myname_1">foo</label></li></ul>
 EOF;
 $t->is($w->render('myname', true), fix_linebreaks($output), '->render() considers true to be an integer 1');
 
-$w = new sfWidgetFormSelectRadio(array('choices' => array()));
-$t->is($w->render('myname', array()), '', '->render() returns an empty HTML string if no choices');
+$w = new \sfWidgetFormSelectRadio(['choices' => []]);
+$t->is($w->render('myname', []), '', '->render() returns an empty HTML string if no choices');
 
 // group support
 $t->diag('group support');
-$w = new sfWidgetFormSelectRadio(array('choices' => array('foo' => array('foo' => 'bar', 'bar' => 'foo'), 'bar' => array('foobar' => 'barfoo'))));
+$w = new \sfWidgetFormSelectRadio(['choices' => ['foo' => ['foo' => 'bar', 'bar' => 'foo'], 'bar' => ['foobar' => 'barfoo']]]);
 $output = <<<'EOF'
 foo <ul class="radio_list"><li><input name="foo" type="radio" value="foo" id="foo_foo" checked="checked" />&nbsp;<label for="foo_foo">bar</label></li>
 <li><input name="foo" type="radio" value="bar" id="foo_bar" />&nbsp;<label for="foo_bar">foo</label></li></ul>
@@ -73,9 +74,9 @@ public function translate($subject, $parameters = array())
 $t->is($w->render('foo', 'foo'), fix_linebreaks($output), '->render() has support for groups');
 
 try {
-    $w = new sfWidgetFormSelectRadio();
+    $w = new \sfWidgetFormSelectRadio();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
 }
 
@@ -84,20 +85,20 @@ public function translate($subject, $parameters = array())
 
 function choice_callable()
 {
-    return array(1, 2, 3);
+    return [1, 2, 3];
 }
-$w = new sfWidgetFormSelectRadio(array('choices' => new sfCallable('choice_callable')));
+$w = new \sfWidgetFormSelectRadio(['choices' => new \sfCallable('choice_callable')]);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('input[type="radio"]')->getNodes()), 3, '->render() accepts a sfCallable as a choices option');
 
 // choices are translated
 $t->diag('choices are translated');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormSelectRadio(array('choices' => array('foo' => 'bar', 'foobar' => 'foo'), 'separator' => ''));
+$w = new \sfWidgetFormSelectRadio(['choices' => ['foo' => 'bar', 'foobar' => 'foo'], 'separator' => '']);
 $w->setParent($ws);
 $output = '<ul class="radio_list">'.
 '<li><input name="foo" type="radio" value="foo" id="foo_foo" />&nbsp;<label for="foo_foo">translation[bar]</label></li>'.
@@ -108,17 +109,17 @@ function choice_callable()
 // choices as escaped
 $t->diag('choices are escaped');
 
-$w = new sfWidgetFormSelectRadio(array('choices' => array('<b>Hello world</b>')));
+$w = new \sfWidgetFormSelectRadio(['choices' => ['<b>Hello world</b>']]);
 $t->is($w->render('foo'), '<ul class="radio_list"><li><input name="foo" type="radio" value="0" id="foo_0" />&nbsp;<label for="foo_0">&lt;b&gt;Hello world&lt;/b&gt;</label></li></ul>', '->render() escapes the choices');
 
 // __clone()
 $t->diag('__clone()');
-$w = new sfWidgetFormSelectRadio(array('choices' => new sfCallable(array($w, 'foo'))));
+$w = new \sfWidgetFormSelectRadio(['choices' => new \sfCallable([$w, 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($w1), '__clone() changes the choices is a callable and the object is an instance of the current object');
 
-$w = new sfWidgetFormSelectRadio(array('choices' => new sfCallable(array($a = new stdClass(), 'foo'))));
+$w = new \sfWidgetFormSelectRadio(['choices' => new \sfCallable([$a = new \stdClass(), 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($a), '__clone() changes nothing if the choices is a callable and the object is not an instance of the current object');
diff --git a/test/unit/widget/sfWidgetFormSelectTest.php b/test/unit/widget/sfWidgetFormSelectTest.php
index d3668963c..5e629f658 100644
--- a/test/unit/widget/sfWidgetFormSelectTest.php
+++ b/test/unit/widget/sfWidgetFormSelectTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,92 +11,92 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-class FormFormatterStub extends sfWidgetFormSchemaFormatter
+class FormFormatterStub extends \sfWidgetFormSchemaFormatter
 {
     public function __construct()
     {
     }
 
-    public function translate($subject, $parameters = array())
+    public function translate($subject, $parameters = [])
     {
         return sprintf('translation[%s]', $subject);
     }
 }
 
-$t = new lime_test(22);
+$t = new \lime_test(22);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
-$w = new sfWidgetFormSelect(array('choices' => array('foo' => 'bar', 'foobar' => 'foo')));
+$w = new \sfWidgetFormSelect(['choices' => ['foo' => 'bar', 'foobar' => 'foo']]);
 $dom->loadHTML($w->render('foo', 'foobar'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 
 $t->is($css->matchSingle('#foo option[value="foobar"][selected="selected"]')->getValue(), 'foo', '->render() renders a select tag with the value selected');
 $t->is(count($css->matchAll('#foo option')->getNodes()), 2, '->render() renders all choices as option tags');
 
 // value attribute is always mandatory
-$w = new sfWidgetFormSelect(array('choices' => array('' => 'bar')));
+$w = new \sfWidgetFormSelect(['choices' => ['' => 'bar']]);
 $t->like($w->render('foo', 'foobar'), '/<option value="">/', '->render() always generate a value attribute, even for empty keys');
 
 // other attributes are removed is empty
-$w = new sfWidgetFormSelect(array('choices' => array('' => 'bar')));
-$t->like($w->render('foo', 'foobar', array('class' => '', 'style' => null)), '/<option value="">/', '->render() always generate a value attribute, even for empty keys');
+$w = new \sfWidgetFormSelect(['choices' => ['' => 'bar']]);
+$t->like($w->render('foo', 'foobar', ['class' => '', 'style' => null]), '/<option value="">/', '->render() always generate a value attribute, even for empty keys');
 
 // multiple select
 $t->diag('multiple select');
-$w = new sfWidgetFormSelect(array('multiple' => true, 'choices' => array('foo' => 'bar', 'foobar' => 'foo')));
-$dom->loadHTML($w->render('foo', array('foo', 'foobar')));
-$css = new sfDomCssSelector($dom);
+$w = new \sfWidgetFormSelect(['multiple' => true, 'choices' => ['foo' => 'bar', 'foobar' => 'foo']]);
+$dom->loadHTML($w->render('foo', ['foo', 'foobar']));
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('select[multiple="multiple"]')->getNodes()), 1, '->render() automatically adds a multiple HTML attributes if multiple is true');
 $t->is(count($css->matchAll('select[name="foo[]"]')->getNodes()), 1, '->render() automatically adds a [] at the end of the name if multiple is true');
 $t->is($css->matchSingle('#foo option[value="foobar"][selected="selected"]')->getValue(), 'foo', '->render() renders a select tag with the value selected');
 $t->is($css->matchSingle('#foo option[value="foo"][selected="selected"]')->getValue(), 'bar', '->render() renders a select tag with the value selected');
 
-$dom->loadHTML($w->render('foo[]', array('foo', 'foobar')));
-$css = new sfDomCssSelector($dom);
+$dom->loadHTML($w->render('foo[]', ['foo', 'foobar']));
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('select[name="foo[]"]')->getNodes()), 1, '->render() automatically does not add a [] at the end of the name if multiple is true and the name already has one');
 
 // optgroup support
 $t->diag('optgroup support');
-$w = new sfWidgetFormSelect(array('choices' => array('foo' => array('foo' => 'bar', 'bar' => 'foo'), 'foobar' => 'foo')));
+$w = new \sfWidgetFormSelect(['choices' => ['foo' => ['foo' => 'bar', 'bar' => 'foo'], 'foobar' => 'foo']]);
 
-$dom->loadHTML($w->render('foo', array('foo', 'foobar')));
-$css = new sfDomCssSelector($dom);
+$dom->loadHTML($w->render('foo', ['foo', 'foobar']));
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo optgroup[label="foo"] option')->getNodes()), 2, '->render() has support for optgroups tags');
 
 try {
-    $w = new sfWidgetFormSelect();
+    $w = new \sfWidgetFormSelect();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a choices option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a choices option');
 }
 
 // choices are translated
 $t->diag('choices are translated');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormSelect(array('choices' => array('foo' => 'bar', 'foobar' => 'foo')));
+$w = new \sfWidgetFormSelect(['choices' => ['foo' => 'bar', 'foobar' => 'foo']]);
 $w->setParent($ws);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo option[value="foo"]')->getValue(), 'translation[bar]', '->render() translates the options');
 $t->is($css->matchSingle('#foo option[value="foobar"]')->getValue(), 'translation[foo]', '->render() translates the options');
 
 // optgroup support with translated choices
 $t->diag('optgroup support with translated choices');
 
-$ws = new sfWidgetFormSchema();
-$ws->addFormFormatter('stub', new FormFormatterStub());
+$ws = new \sfWidgetFormSchema();
+$ws->addFormFormatter('stub', new \FormFormatterStub());
 $ws->setFormFormatterName('stub');
-$w = new sfWidgetFormSelect(array('choices' => array('group' => array('foo' => 'bar', 'foobar' => 'foo'))));
+$w = new \sfWidgetFormSelect(['choices' => ['group' => ['foo' => 'bar', 'foobar' => 'foo']]]);
 $w->setParent($ws);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo optgroup[label="translation[group]"] option[value="foo"]')->getValue(), 'translation[bar]', '->render() translates the options');
 $t->is($css->matchSingle('#foo optgroup[label="translation[group]"] option[value="foobar"]')->getValue(), 'translation[foo]', '->render() translates the options');
 
@@ -104,35 +105,35 @@ public function translate($subject, $parameters = array())
 
 function choice_callable()
 {
-    return array(1, 2, 3);
+    return [1, 2, 3];
 }
-$w = new sfWidgetFormSelect(array('choices' => new sfCallable('choice_callable')));
+$w = new \sfWidgetFormSelect(['choices' => new \sfCallable('choice_callable')]);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo option')->getNodes()), 3, '->render() accepts a sfCallable as a choices option');
 
 // attributes
 $t->diag('attributes');
-$w = new sfWidgetFormSelect(array('choices' => array(0, 1, 2)));
-$dom->loadHTML($w->render('foo', null, array('disabled' => 'disabled')));
-$css = new sfDomCssSelector($dom);
+$w = new \sfWidgetFormSelect(['choices' => [0, 1, 2]]);
+$dom->loadHTML($w->render('foo', null, ['disabled' => 'disabled']));
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 1, '->render() does not pass the select HTML attributes to the option tag');
 $t->is(count($css->matchAll('option[disabled="disabled"]')->getNodes()), 0, '->render() does not pass the select HTML attributes to the option tag');
 
-$w = new sfWidgetFormSelect(array('choices' => array(0, 1, 2)), array('disabled' => 'disabled'));
+$w = new \sfWidgetFormSelect(['choices' => [0, 1, 2]], ['disabled' => 'disabled']);
 $dom->loadHTML($w->render('foo'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 1, '->render() does not pass the select HTML attributes to the option tag');
 $t->is(count($css->matchAll('option[disabled="disabled"]')->getNodes()), 0, '->render() does not pass the select HTML attributes to the option tag');
 
 // __clone()
 $t->diag('__clone()');
-$w = new sfWidgetFormSelect(array('choices' => new sfCallable(array($w, 'foo'))));
+$w = new \sfWidgetFormSelect(['choices' => new \sfCallable([$w, 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($w1), '__clone() changes the choices is a callable and the object is an instance of the current object');
 
-$w = new sfWidgetFormSelect(array('choices' => new sfCallable(array($a = new stdClass(), 'foo'))));
+$w = new \sfWidgetFormSelect(['choices' => new \sfCallable([$a = new \stdClass(), 'foo'])]);
 $w1 = clone $w;
 $callable = $w1->getOption('choices')->getCallable();
 $t->is(spl_object_hash($callable[0]), spl_object_hash($a), '__clone() changes nothing if the choices is a callable and the object is not an instance of the current object');
diff --git a/test/unit/widget/sfWidgetFormTest.php b/test/unit/widget/sfWidgetFormTest.php
index 20457aafa..c844cc866 100644
--- a/test/unit/widget/sfWidgetFormTest.php
+++ b/test/unit/widget/sfWidgetFormTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,13 +11,13 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(35);
+$t = new \lime_test(35);
 
-class MyWidgetForm extends sfWidgetForm
+class MyWidgetForm extends \sfWidgetForm
 {
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
-        return $this->renderTag('input', array_merge(array('name' => $name), $attributes)).$this->renderContentTag('textarea', null, array_merge(array('name' => $name), $attributes));
+        return $this->renderTag('input', array_merge(['name' => $name], $attributes)).$this->renderContentTag('textarea', null, array_merge(['name' => $name], $attributes));
     }
 
     public function generateId($name, $value = null)
@@ -27,41 +28,41 @@ public function generateId($name, $value = null)
 
 // __construct()
 $t->diag('__construct()');
-$w = new MyWidgetForm(array('id_format' => '%s'));
+$w = new \MyWidgetForm(['id_format' => '%s']);
 $t->is($w->render('foo'), '<input name="foo" id="foo" /><textarea name="foo" id="foo"></textarea>', '__construct() takes a id_format argument');
-$t->is($w->render('foo', null, array('id' => 'id_foo')), '<input name="foo" id="id_foo" /><textarea name="foo" id="id_foo"></textarea>', '->render() id attributes takes precedence over auto generated ids');
+$t->is($w->render('foo', null, ['id' => 'id_foo']), '<input name="foo" id="id_foo" /><textarea name="foo" id="id_foo"></textarea>', '->render() id attributes takes precedence over auto generated ids');
 
-$w = new MyWidgetForm(array('id_format' => false));
+$w = new \MyWidgetForm(['id_format' => false]);
 $t->is($w->render('foo'), '<input name="foo" /><textarea name="foo"></textarea>', '__construct() can disable id generation');
 
 // ->getLabel() ->setLabel()
 $t->diag('->getLabel() ->setLabel()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $t->is($w->getLabel(), null, '->getLabel() returns null if no label has been defined');
-$w = new MyWidgetForm(array('label' => 'foo'));
+$w = new \MyWidgetForm(['label' => 'foo']);
 $t->is($w->getLabel(), 'foo', '->getLabel() returns the label');
 $w->setLabel('bar');
 $t->is($w->getLabel(), 'bar', '->setLabel() changes the label');
 
 // ->getDefault() ->setDefault()
 $t->diag('->getDefault() ->setDefault()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $t->is($w->getDefault(), null, '->getDefault() returns null if no default value has been defined');
-$w = new MyWidgetForm(array('default' => 'foo'));
+$w = new \MyWidgetForm(['default' => 'foo']);
 $t->is($w->getDefault(), 'foo', '->getDefault() returns the default value');
 $w->setDefault('bar');
 $t->is($w->getDefault(), 'bar', '->setDefault() changes the default value for the widget');
 
 // ->getParent() ->setParent()
 $t->diag('->getParent() ->setParent()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $t->is($w->getParent(), null, '->getParent() returns null if no widget schema has been defined');
-$w->setParent($ws = new sfWidgetFormSchema());
+$w->setParent($ws = new \sfWidgetFormSchema());
 $t->is($w->getParent(), $ws, '->setParent() associates a widget schema to the widget');
 
 // ->getIdFormat() ->setIdFormat()
 $t->diag('->getIdFormat() ->setIdFormat()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $w->setIdFormat('id_%s');
 $t->is($w->getIdFormat(), 'id_%s', '->setIdFormat() sets the format for the generated id attribute');
 
@@ -74,33 +75,33 @@ public function generateId($name, $value = null)
 // ->needsMultipartForm()
 $t->diag('->needsMultipartForm()');
 $t->is($w->needsMultipartForm(), false, '->needsMultipartForm() returns false if the widget does not need a multipart form');
-$w = new MyWidgetForm(array('needs_multipart' => true));
+$w = new \MyWidgetForm(['needs_multipart' => true]);
 $t->is($w->needsMultipartForm(), true, '->needsMultipartForm() returns false if the widget needs a multipart form');
 
 // ->renderTag()
 $t->diag('->renderTag()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $t->is($w->renderTag('input'), '<input />', '->renderTag() does not add an id if no name is given');
-$t->is($w->renderTag('input', array('id' => 'foo')), '<input id="foo" />', '->renderTag() does not add an id if one is given');
-$t->is($w->renderTag('input', array('name' => 'foo')), '<input name="foo" id="foo" />', '->renderTag() adds an id if none is given and a name is given');
+$t->is($w->renderTag('input', ['id' => 'foo']), '<input id="foo" />', '->renderTag() does not add an id if one is given');
+$t->is($w->renderTag('input', ['name' => 'foo']), '<input name="foo" id="foo" />', '->renderTag() adds an id if none is given and a name is given');
 $w->setIdFormat('id_%s');
-$t->is($w->renderTag('input', array('name' => 'foo')), '<input name="foo" id="id_foo" />', '->renderTag() uses the id_format to generate an id');
-sfWidget::setXhtml(false);
+$t->is($w->renderTag('input', ['name' => 'foo']), '<input name="foo" id="id_foo" />', '->renderTag() uses the id_format to generate an id');
+\sfWidget::setXhtml(false);
 $t->is($w->renderTag('input'), '<input>', '->renderTag() does not close tag if not in XHTML mode');
-sfWidget::setXhtml(true);
+\sfWidget::setXhtml(true);
 
 // ->renderContentTag()
 $t->diag('->renderContentTag()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $t->is($w->renderContentTag('textarea'), '<textarea></textarea>', '->renderContentTag() does not add an id if no name is given');
-$t->is($w->renderContentTag('textarea', '', array('id' => 'foo')), '<textarea id="foo"></textarea>', '->renderContentTag() does not add an id if one is given');
-$t->is($w->renderContentTag('textarea', '', array('name' => 'foo')), '<textarea name="foo" id="foo"></textarea>', '->renderContentTag() adds an id if none is given and a name is given');
+$t->is($w->renderContentTag('textarea', '', ['id' => 'foo']), '<textarea id="foo"></textarea>', '->renderContentTag() does not add an id if one is given');
+$t->is($w->renderContentTag('textarea', '', ['name' => 'foo']), '<textarea name="foo" id="foo"></textarea>', '->renderContentTag() adds an id if none is given and a name is given');
 $w->setIdFormat('id_%s');
-$t->is($w->renderContentTag('textarea', '', array('name' => 'foo')), '<textarea name="foo" id="id_foo"></textarea>', '->renderContentTag() uses the id_format to generate an id');
+$t->is($w->renderContentTag('textarea', '', ['name' => 'foo']), '<textarea name="foo" id="id_foo"></textarea>', '->renderContentTag() uses the id_format to generate an id');
 
 // ->generateId()
 $t->diag('->generateId()');
-$w = new MyWidgetForm();
+$w = new \MyWidgetForm();
 $w->setIdFormat('id_for_%s_works');
 $t->is($w->generateId('foo'), 'id_for_foo_works', '->setIdFormat() sets the format of the widget id');
 $t->is($w->generateId('foo[]'), 'id_for_foo_works', '->generateId() removes the [] from the name');
@@ -110,7 +111,7 @@ public function generateId($name, $value = null)
 
 $w->setIdFormat('id');
 $t->is($w->generateId('foo[bar][]', 'test'), 'foo_bar_test', '->generateId() returns the name if the id format does not contain %s');
-$t->is($w->generateId('foo[bar][]', array('test1', 'test2')), 'foo_bar', '->generateId() ignore the value if not a string');
+$t->is($w->generateId('foo[bar][]', ['test1', 'test2']), 'foo_bar', '->generateId() ignore the value if not a string');
 
 $w->setIdFormat('%s');
 $t->is($w->generateId('_foo[bar][]', 'test'), 'foo_bar_test', '->generateId() removes invalid characters');
diff --git a/test/unit/widget/sfWidgetFormTextareaTest.php b/test/unit/widget/sfWidgetFormTextareaTest.php
index 4db3121ac..4f3050917 100644
--- a/test/unit/widget/sfWidgetFormTextareaTest.php
+++ b/test/unit/widget/sfWidgetFormTextareaTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,9 +11,9 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(4);
+$t = new \lime_test(4);
 
-$w = new sfWidgetFormTextarea();
+$w = new \sfWidgetFormTextarea();
 
 // ->render()
 $t->diag('->render()');
diff --git a/test/unit/widget/sfWidgetFormTimeTest.php b/test/unit/widget/sfWidgetFormTimeTest.php
index e99fa7764..f806b287e 100644
--- a/test/unit/widget/sfWidgetFormTimeTest.php
+++ b/test/unit/widget/sfWidgetFormTimeTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,22 +11,22 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(43);
+$t = new \lime_test(43);
 
-$w = new sfWidgetFormTime(array('with_seconds' => true));
+$w = new \sfWidgetFormTime(['with_seconds' => true]);
 
-$dom = new DOMDocument('1.0', 'utf-8');
+$dom = new \DOMDocument('1.0', 'utf-8');
 $dom->validateOnParse = true;
 
 // ->render()
 $t->diag('->render()');
 
-foreach (array(
+foreach ([
     '12:30:35',
     mktime(12, 30, 35, 15, 10, 2005),
-) as $date) {
+] as $date) {
     $dom->loadHTML($w->render('foo', $date));
-    $css = new sfDomCssSelector($dom);
+    $css = new \sfDomCssSelector($dom);
 
     // selected date
     $t->is($css->matchSingle('#foo_hour option[value="12"][selected="selected"]')->getValue(), 12, '->render() renders a select tag for the hour');
@@ -35,8 +36,8 @@
 
 // time as an array
 $t->diag('time as an array');
-$dom->loadHTML($w->render('foo', array('hour' => 12, 'minute' => '30', 'second' => 35)));
-$css = new sfDomCssSelector($dom);
+$dom->loadHTML($w->render('foo', ['hour' => 12, 'minute' => '30', 'second' => 35]));
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_hour option[value="12"][selected="selected"]')->getValue(), 12, '->render() renders a select tag for the hour');
 $t->is($css->matchSingle('#foo_minute option[value="30"][selected="selected"]')->getValue(), 30, '->render() renders a select tag for the minute');
 $t->is($css->matchSingle('#foo_second option[value="35"][selected="selected"]')->getValue(), 35, '->render() renders a select tag for the second');
@@ -44,21 +45,21 @@
 // time as an array - single digits
 $t->diag('time as an array - single digits');
 $dom->loadHTML($w->render('foo', '01:03:05'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_hour option[selected="selected"]')->getValue(), '01', '->render() renders a select tag for the hour');
 $t->is($css->matchSingle('#foo_minute option[selected="selected"]')->getValue(), '03', '->render() renders a select tag for the minute');
 $t->is($css->matchSingle('#foo_second option[selected="selected"]')->getValue(), '05', '->render() renders a select tag for the second');
 
 // invalid time
 $t->diag('time as an array');
-$dom->loadHTML($w->render('foo', array('hour' => null, 'minute' => 30)));
-$css = new sfDomCssSelector($dom);
+$dom->loadHTML($w->render('foo', ['hour' => null, 'minute' => 30]));
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_hour option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the hour');
 $t->is($css->matchSingle('#foo_minute option[selected="selected"]')->getValue(), 30, '->render() renders a select tag for the minute');
 $t->is($css->matchSingle('#foo_second option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the second');
 
 $dom->loadHTML($w->render('foo', 'invalidtime'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_hour option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the hour');
 $t->is($css->matchSingle('#foo_minute option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the minute');
 $t->is($css->matchSingle('#foo_second option[selected="selected"]')->getValue(), '', '->render() renders a select tag for the second');
@@ -66,7 +67,7 @@
 // number of options in each select
 $t->diag('number of options in each select');
 $dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_hour option')->getNodes()), 25, '->render() renders a select tag for the 24 hours in a day');
 $t->is(count($css->matchAll('#foo_minute option')->getNodes()), 61, '->render() renders a select tag for the 60 minutes in an hour');
 $t->is(count($css->matchAll('#foo_second option')->getNodes()), 61, '->render() renders a select tag for the 60 seconds in a minute');
@@ -75,7 +76,7 @@
 $t->diag('can_be_empty option');
 $w->setOption('can_be_empty', false);
 $dom->loadHTML($w->render('foo', '2005-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_hour option')->getNodes()), 24, '->render() renders a select tag for the 24 hours around in a day');
 $t->is(count($css->matchAll('#foo_minute option')->getNodes()), 60, '->render() renders a select tag for the 60 minutes in an hour');
 $t->is(count($css->matchAll('#foo_second option')->getNodes()), 60, '->render() renders a select tag for the 60 seconds in a minute');
@@ -83,13 +84,13 @@
 
 // empty_values
 $t->diag('empty_values option');
-$w->setOption('empty_values', array('hour' => 'HOUR', 'minute' => 'MINUTE', 'second' => 'SECOND'));
+$w->setOption('empty_values', ['hour' => 'HOUR', 'minute' => 'MINUTE', 'second' => 'SECOND']);
 $dom->loadHTML($w->render('foo', '2005-10-15'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('#foo_hour option')->getNode()->nodeValue, 'HOUR', '->configure() can change the empty values');
 $t->is($css->matchSingle('#foo_minute option')->getNode()->nodeValue, 'MINUTE', '->configure() can change the empty values');
 $t->is($css->matchSingle('#foo_second option')->getNode()->nodeValue, 'SECOND', '->configure() can change the empty values');
-$w->setOption('empty_values', array('hour' => '', 'minute' => '', 'second' => ''));
+$w->setOption('empty_values', ['hour' => '', 'minute' => '', 'second' => '']);
 
 // format option
 $t->diag('format option');
@@ -98,22 +99,22 @@
 
 $w->setOption('format', '%hour%#%minute%#%second%');
 $dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->like($css->matchSingle('#foo_hour')->getNode()->nextSibling->nodeValue, '/^#/', '__construct() can change the default format');
 $t->is($css->matchSingle('#foo_minute')->getNode()->nextSibling->nodeValue, '#', '__construct() can change the default format');
 
 $w->setOption('format', '%minute%#%hour%#%second%');
 $dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is($css->matchSingle('select')->getNode()->getAttribute('name'), 'foo[minute]', '__construct() can change the default time format');
 
 // hours / minutes / seconds options
 $t->diag('hours / minutes / seconds options');
-$w->setOption('hours', array(1 => 1, 2 => 2, 3 => 3, 4 => 4));
-$w->setOption('minutes', array(1 => 1, 2 => 2));
-$w->setOption('seconds', array(15 => 15, 30 => 30, 45 => 45));
+$w->setOption('hours', [1 => 1, 2 => 2, 3 => 3, 4 => 4]);
+$w->setOption('minutes', [1 => 1, 2 => 2]);
+$w->setOption('seconds', [15 => 15, 30 => 30, 45 => 45]);
 $dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_hour option')->getNodes()), 5, '__construct() can change the default array used for hours');
 $t->is(count($css->matchAll('#foo_minute option')->getNodes()), 3, '__construct() can change the default array used for minutes');
 $t->is(count($css->matchAll('#foo_second option')->getNodes()), 4, '__construct() can change the default array used for seconds');
@@ -122,19 +123,19 @@
 $t->diag('with_seconds option');
 $w->setOption('with_seconds', false);
 $dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->is(count($css->matchAll('#foo_second option')->getNodes()), 0, '__construct() can enable or disable the seconds select box with the with_seconds option');
 
 $w->setOption('format_without_seconds', '%hour%#%minute%');
 $dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
+$css = new \sfDomCssSelector($dom);
 $t->like($css->matchSingle('#foo_hour')->getNode()->nextSibling->nodeValue, '/^#/', '__construct() can change the default format');
 $t->ok(!count($css->matchSingle('#foo_second')->getNodes()), '__construct() can change the default format');
 
 // attributes
 $t->diag('attributes');
 $w->setOption('with_seconds', true);
-$dom->loadHTML($w->render('foo', '12:30:35', array('disabled' => 'disabled')));
+$dom->loadHTML($w->render('foo', '12:30:35', ['disabled' => 'disabled']));
 $t->is(count($css->matchAll('select[disabled="disabled"]')->getNodes()), 3, '->render() takes the attributes into account for all the three embedded widgets');
 
 $w->setAttribute('disabled', 'disabled');
diff --git a/test/unit/widget/sfWidgetTest.php b/test/unit/widget/sfWidgetTest.php
index 5e7e83463..a411ff2f0 100644
--- a/test/unit/widget/sfWidgetTest.php
+++ b/test/unit/widget/sfWidgetTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,24 +11,24 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(33);
+$t = new \lime_test(33);
 
-class MyWidget extends sfWidget
+class MyWidget extends \sfWidget
 {
-    public function render($name, $value = null, $attributes = array(), $errors = array())
+    public function render($name, $value = null, $attributes = [], $errors = [])
     {
         return $this->attributesToHtml(array_merge($this->attributes, $attributes));
     }
 
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addOption('foo');
     }
 }
 
-class MyWidgetWithRequired extends MyWidget
+class MyWidgetWithRequired extends \MyWidget
 {
-    protected function configure($options = array(), $attributes = array())
+    protected function configure($options = [], $attributes = [])
     {
         $this->addRequiredOption('foo');
     }
@@ -35,32 +36,32 @@ protected function configure($options = array(), $attributes = array())
 
 // __construct()
 $t->diag('__construct()');
-$w = new MyWidget();
-$t->is($w->getAttributes(), array(), '->__construct() can take no argument');
-$w = new MyWidget(array(), array('class' => 'foo'));
-$t->is($w->getAttributes(), array('class' => 'foo'), '->__construct() can take an array of default HTML attributes');
+$w = new \MyWidget();
+$t->is($w->getAttributes(), [], '->__construct() can take no argument');
+$w = new \MyWidget([], ['class' => 'foo']);
+$t->is($w->getAttributes(), ['class' => 'foo'], '->__construct() can take an array of default HTML attributes');
 
 try {
-    new MyWidget(array('nonexistant' => false));
+    new \MyWidget(['nonexistant' => false]);
     $t->fail('__construct() throws an InvalidArgumentException if you pass some non existant options');
     $t->skip();
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('__construct() throws an InvalidArgumentException if you pass some non existant options');
     $t->like($e->getMessage(), '/ \'nonexistant\'/', 'The exception contains the non existant option names');
 }
 
 $t->diag('getRequiredOptions');
-$w = new MyWidgetWithRequired(array('foo' => 'bar'));
-$t->is($w->getRequiredOptions(), array('foo'), '->getRequiredOptions() returns an array of required option names');
+$w = new \MyWidgetWithRequired(['foo' => 'bar']);
+$t->is($w->getRequiredOptions(), ['foo'], '->getRequiredOptions() returns an array of required option names');
 
 try {
-    new MyWidgetWithRequired();
+    new \MyWidgetWithRequired();
     $t->fail('__construct() throws an RuntimeException if you don\'t pass a required option');
-} catch (RuntimeException $e) {
+} catch (\RuntimeException $e) {
     $t->pass('__construct() throws an RuntimeException if you don\'t pass a required option');
 }
 
-$w = new MyWidget();
+$w = new \MyWidget();
 
 // ->getOption() ->setOption() ->setOptions() ->getOptions() ->hasOption()
 $t->diag('->getOption() ->setOption() ->setOptions() ->getOptions() ->hasOption()');
@@ -74,7 +75,7 @@ protected function configure($options = array(), $attributes = array())
 try {
     $w->setOption('foobar', 'foo');
     $t->fail('->setOption() throws an InvalidArgumentException if the option is not registered');
-} catch (InvalidArgumentException $e) {
+} catch (\InvalidArgumentException $e) {
     $t->pass('->setOption() throws an InvalidArgumentException if the option is not registered');
 }
 
@@ -84,11 +85,11 @@ protected function configure($options = array(), $attributes = array())
 $w->setOption('foobar', 'bar');
 $t->is($w->getOption('foobar'), 'bar', '->addOption() adds a new option');
 
-$w = new MyWidget();
-$w->setOptions(array('foo' => 'bar'));
-$t->is($w->getOptions(), array('foo' => 'bar'), '->getOptions() returns an array of all options');
+$w = new \MyWidget();
+$w->setOptions(['foo' => 'bar']);
+$t->is($w->getOptions(), ['foo' => 'bar'], '->getOptions() returns an array of all options');
 
-$w = new MyWidget();
+$w = new \MyWidget();
 
 // ->setAttribute() ->getAttribute()
 $t->diag('->setAttribute() ->getAttribute()');
@@ -97,35 +98,35 @@ protected function configure($options = array(), $attributes = array())
 
 // ->getAttributes()
 $t->diag('->getAttributes()');
-$t->is($w->getAttributes(), array('foo' => 'bar'), '->getAttributes() returns an array of attributes');
+$t->is($w->getAttributes(), ['foo' => 'bar'], '->getAttributes() returns an array of attributes');
 
 // ->setAttributes()
 $t->diag('->setAttributes()');
-$w->setAttributes(array('foo' => 'bar'));
-$t->is($w->getAttributes(), array('foo' => 'bar'), '->setAttributes() sets attributes');
+$w->setAttributes(['foo' => 'bar']);
+$t->is($w->getAttributes(), ['foo' => 'bar'], '->setAttributes() sets attributes');
 
 // ->attributesToHtml()
 $t->diag('->attributesToHtml()');
-$w = new MyWidget(array(), array('foo' => 'bar', 'foobar' => '<strong>été</strong>'));
+$w = new \MyWidget([], ['foo' => 'bar', 'foobar' => '<strong>été</strong>']);
 $t->is($w->render('foo', 'bar'), ' foo="bar" foobar="&lt;strong&gt;été&lt;/strong&gt;"', '->attributesToHtml() converts an attribute array to an HTML attribute string');
 
 // ->renderTag()
 $t->diag('->renderTag()');
-$w = new MyWidget(array(), array('foo' => 'bar'));
-$t->is($w->renderTag('input', array('bar' => 'foo')), '<input foo="bar" bar="foo" />', '->renderTag() renders a HTML tag with attributes');
+$w = new \MyWidget([], ['foo' => 'bar']);
+$t->is($w->renderTag('input', ['bar' => 'foo']), '<input foo="bar" bar="foo" />', '->renderTag() renders a HTML tag with attributes');
 $t->is($w->renderTag(''), '', '->renderTag() renders an empty string if the tag name is empty');
 
 // ->renderContentTag()
 $t->diag('->renderContentTag()');
-$w = new MyWidget(array(), array('foo' => 'bar'));
-$t->is($w->renderContentTag('textarea', 'content', array('bar' => 'foo')), '<textarea foo="bar" bar="foo">content</textarea>', '->renderContentTag() renders a HTML tag with content and attributes');
+$w = new \MyWidget([], ['foo' => 'bar']);
+$t->is($w->renderContentTag('textarea', 'content', ['bar' => 'foo']), '<textarea foo="bar" bar="foo">content</textarea>', '->renderContentTag() renders a HTML tag with content and attributes');
 $t->is($w->renderContentTag(''), '', '->renderContentTag() renders an empty string if the tag name is empty');
 
 // ::escapeOnce()
 $t->diag('::escapeOnce()');
-$t->is(sfWidget::escapeOnce('This a > text to "escape"'), 'This a &gt; text to &quot;escape&quot;', '::escapeOnce() escapes an HTML strings');
-$t->is(sfWidget::escapeOnce(sfWidget::escapeOnce('This a > text to "escape"')), 'This a &gt; text to &quot;escape&quot;', '::escapeOnce() does not escape an already escaped string');
-$t->is(sfWidget::escapeOnce('This a &gt; text to "escape"'), 'This a &gt; text to &quot;escape&quot;', '::escapeOnce() does not escape an already escaped string');
+$t->is(\sfWidget::escapeOnce('This a > text to "escape"'), 'This a &gt; text to &quot;escape&quot;', '::escapeOnce() escapes an HTML strings');
+$t->is(\sfWidget::escapeOnce(\sfWidget::escapeOnce('This a > text to "escape"')), 'This a &gt; text to &quot;escape&quot;', '::escapeOnce() does not escape an already escaped string');
+$t->is(\sfWidget::escapeOnce('This a &gt; text to "escape"'), 'This a &gt; text to &quot;escape&quot;', '::escapeOnce() does not escape an already escaped string');
 
 class MyClass
 {
@@ -134,27 +135,27 @@ public function __toString()
         return 'mycontent';
     }
 }
-$t->is(sfWidget::escapeOnce(new MyClass()), 'mycontent', '::escapeOnce() converts objects to string');
+$t->is(\sfWidget::escapeOnce(new \MyClass()), 'mycontent', '::escapeOnce() converts objects to string');
 
 // ::fixDoubleEscape()
 $t->diag('::fixDoubleEscape()');
-$t->is(sfWidget::fixDoubleEscape(htmlspecialchars(htmlspecialchars('This a > text to "escape"'), ENT_QUOTES, sfWidget::getCharset()), ENT_QUOTES, sfWidget::getCharset()), 'This a &gt; text to &quot;escape&quot;', '::fixDoubleEscape() fixes double escaped strings');
+$t->is(\sfWidget::fixDoubleEscape(htmlspecialchars(htmlspecialchars('This a > text to "escape"'), ENT_QUOTES, \sfWidget::getCharset()), ENT_QUOTES, \sfWidget::getCharset()), 'This a &gt; text to &quot;escape&quot;', '::fixDoubleEscape() fixes double escaped strings');
 
 // ::getCharset() ::setCharset()
 $t->diag('::getCharset() ::setCharset()');
-$t->is(sfWidget::getCharset(), 'UTF-8', '::getCharset() returns the charset to use for widgets');
-sfWidget::setCharset('ISO-8859-1');
-$t->is(sfWidget::getCharset(), 'ISO-8859-1', '::setCharset() changes the charset to use for widgets');
+$t->is(\sfWidget::getCharset(), 'UTF-8', '::getCharset() returns the charset to use for widgets');
+\sfWidget::setCharset('ISO-8859-1');
+$t->is(\sfWidget::getCharset(), 'ISO-8859-1', '::setCharset() changes the charset to use for widgets');
 
 // ::setXhtml() ::isXhtml()
 $t->diag('::setXhtml() ::isXhtml()');
-$w = new MyWidget();
-$t->is(sfWidget::isXhtml(), true, '::isXhtml() return true if the widget must returns XHTML tags');
-sfWidget::setXhtml(false);
-$t->is($w->renderTag('input', array('value' => 'Test')), '<input value="Test">', '::setXhtml() changes the value of the XHTML tag');
+$w = new \MyWidget();
+$t->is(\sfWidget::isXhtml(), true, '::isXhtml() return true if the widget must returns XHTML tags');
+\sfWidget::setXhtml(false);
+$t->is($w->renderTag('input', ['value' => 'Test']), '<input value="Test">', '::setXhtml() changes the value of the XHTML tag');
 
 // ->getJavaScripts() ->getStylesheets()
 $t->diag('->getJavaScripts() ->getStylesheets()');
-$w = new MyWidget();
-$t->is($w->getJavaScripts(), array(), '->getJavaScripts() returns an array of stylesheets');
-$t->is($w->getStylesheets(), array(), '->getStylesheets() returns an array of JavaScripts');
+$w = new \MyWidget();
+$t->is($w->getJavaScripts(), [], '->getJavaScripts() returns an array of stylesheets');
+$t->is($w->getStylesheets(), [], '->getStylesheets() returns an array of JavaScripts');
diff --git a/test/unit/yaml/sfYamlDumperTest.php b/test/unit/yaml/sfYamlDumperTest.php
index 58315c5a0..e30018f48 100644
--- a/test/unit/yaml/sfYamlDumperTest.php
+++ b/test/unit/yaml/sfYamlDumperTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,12 +11,12 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-sfYaml::setSpecVersion('1.1');
+\sfYaml::setSpecVersion('1.1');
 
-$t = new lime_test(149);
+$t = new \lime_test(149);
 
-$parser = new sfYamlParser();
-$dumper = new sfYamlDumper();
+$parser = new \sfYamlParser();
+$dumper = new \sfYamlDumper();
 
 $path = __DIR__.'/fixtures';
 $files = $parser->parse(file_get_contents($path.'/index.yml'));
@@ -45,20 +46,20 @@
 }
 
 // inline level
-$array = array(
+$array = [
     '' => 'bar',
     'foo' => '#bar',
-    'foo\'bar' => array(),
-    'bar' => array(1, 'foo'),
-    'foobar' => array(
+    'foo\'bar' => [],
+    'bar' => [1, 'foo'],
+    'foobar' => [
         'foo' => 'bar',
-        'bar' => array(1, 'foo'),
-        'foobar' => array(
+        'bar' => [1, 'foo'],
+        'foobar' => [
             'foo' => 'bar',
-            'bar' => array(1, 'foo'),
-        ),
-    ),
-);
+            'bar' => [1, 'foo'],
+        ],
+    ],
+];
 
 $expected = <<<'EOF'
 { '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
@@ -138,5 +139,5 @@ class A
 {
     public $a = 'foo';
 }
-$a = array('foo' => new A(), 'bar' => 1);
+$a = ['foo' => new \A(), 'bar' => 1];
 $t->is($dumper->dump($a), '{ foo: !!php/object:O:1:"A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', '->dump() is able to dump objects');
diff --git a/test/unit/yaml/sfYamlInlineTest.php b/test/unit/yaml/sfYamlInlineTest.php
index 29fb32ee4..46c717233 100644
--- a/test/unit/yaml/sfYamlInlineTest.php
+++ b/test/unit/yaml/sfYamlInlineTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,14 +11,14 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-sfYaml::setSpecVersion('1.1');
+\sfYaml::setSpecVersion('1.1');
 
-$t = new lime_test(124);
+$t = new \lime_test(124);
 
 // ::load()
 $t->diag('::load()');
 
-$testsForLoad = array(
+$testsForLoad = [
     '' => '',
     'null' => null,
     'false' => false,
@@ -45,40 +46,40 @@
 
     // sequences
     // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-    '[foo, http://urls.are/no/mappings, false, null, 12]' => array('foo', 'http://urls.are/no/mappings', false, null, 12),
-    '[  foo  ,   bar , false  ,  null     ,  12  ]' => array('foo', 'bar', false, null, 12),
-    '[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'),
+    '[foo, http://urls.are/no/mappings, false, null, 12]' => ['foo', 'http://urls.are/no/mappings', false, null, 12],
+    '[  foo  ,   bar , false  ,  null     ,  12  ]' => ['foo', 'bar', false, null, 12],
+    '[\'foo,bar\', \'foo bar\']' => ['foo,bar', 'foo bar'],
 
     // mappings
-    '{foo:bar,bar:foo,false:false,null:null,integer:12}' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12),
-    '{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12),
-    '{foo: \'bar\', bar: \'foo: bar\'}' => array('foo' => 'bar', 'bar' => 'foo: bar'),
-    '{\'foo\': \'bar\', "bar": \'foo: bar\'}' => array('foo' => 'bar', 'bar' => 'foo: bar'),
-    '{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}' => array('foo\'' => 'bar', 'bar"' => 'foo: bar'),
-    '{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}' => array('foo: ' => 'bar', 'bar: ' => 'foo: bar'),
+    '{foo:bar,bar:foo,false:false,null:null,integer:12}' => ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12],
+    '{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }' => ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12],
+    '{foo: \'bar\', bar: \'foo: bar\'}' => ['foo' => 'bar', 'bar' => 'foo: bar'],
+    '{\'foo\': \'bar\', "bar": \'foo: bar\'}' => ['foo' => 'bar', 'bar' => 'foo: bar'],
+    '{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}' => ['foo\'' => 'bar', 'bar"' => 'foo: bar'],
+    '{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}' => ['foo: ' => 'bar', 'bar: ' => 'foo: bar'],
 
     // nested sequences and mappings
-    '[foo, [bar, foo]]' => array('foo', array('bar', 'foo')),
-    '[foo, {bar: foo}]' => array('foo', array('bar' => 'foo')),
-    '{ foo: {bar: foo} }' => array('foo' => array('bar' => 'foo')),
-    '{ foo: [bar, foo] }' => array('foo' => array('bar', 'foo')),
+    '[foo, [bar, foo]]' => ['foo', ['bar', 'foo']],
+    '[foo, {bar: foo}]' => ['foo', ['bar' => 'foo']],
+    '{ foo: {bar: foo} }' => ['foo' => ['bar' => 'foo']],
+    '{ foo: [bar, foo] }' => ['foo' => ['bar', 'foo']],
 
-    '[  foo, [  bar, foo  ]  ]' => array('foo', array('bar', 'foo')),
+    '[  foo, [  bar, foo  ]  ]' => ['foo', ['bar', 'foo']],
 
-    '[{ foo: {bar: foo} }]' => array(array('foo' => array('bar' => 'foo'))),
+    '[{ foo: {bar: foo} }]' => [['foo' => ['bar' => 'foo']]],
 
-    '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo')),
+    '[foo, [bar, [foo, [bar, foo]], foo]]' => ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']],
 
-    '[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]' => array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo'))),
+    '[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]' => ['foo', ['bar' => 'foo', 'foo' => ['foo', ['bar' => 'foo']]], ['foo', ['bar' => 'foo']]],
 
-    '[foo, bar: { foo: bar }]' => array('foo', '1' => array('bar' => array('foo' => 'bar'))),
-);
+    '[foo, bar: { foo: bar }]' => ['foo', '1' => ['bar' => ['foo' => 'bar']]],
+];
 
 foreach ($testsForLoad as $yaml => $value) {
-    $t->is_deeply(sfYamlInline::load($yaml), $value, sprintf('::load() converts an inline YAML to a PHP structure (%s)', $yaml));
+    $t->is_deeply(\sfYamlInline::load($yaml), $value, sprintf('::load() converts an inline YAML to a PHP structure (%s)', $yaml));
 }
 
-$testsForDump = array(
+$testsForDump = [
     'null' => null,
     'false' => false,
     'true' => true,
@@ -97,29 +98,29 @@
     "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
 
     // sequences
-    '[foo, bar, false, null, 12]' => array('foo', 'bar', false, null, 12),
-    '[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'),
+    '[foo, bar, false, null, 12]' => ['foo', 'bar', false, null, 12],
+    '[\'foo,bar\', \'foo bar\']' => ['foo,bar', 'foo bar'],
 
     // mappings
-    '{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12),
-    '{ foo: bar, bar: \'foo: bar\' }' => array('foo' => 'bar', 'bar' => 'foo: bar'),
+    '{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }' => ['foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12],
+    '{ foo: bar, bar: \'foo: bar\' }' => ['foo' => 'bar', 'bar' => 'foo: bar'],
 
     // nested sequences and mappings
-    '[foo, [bar, foo]]' => array('foo', array('bar', 'foo')),
+    '[foo, [bar, foo]]' => ['foo', ['bar', 'foo']],
 
-    '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo')),
+    '[foo, [bar, [foo, [bar, foo]], foo]]' => ['foo', ['bar', ['foo', ['bar', 'foo']], 'foo']],
 
-    '{ foo: { bar: foo } }' => array('foo' => array('bar' => 'foo')),
+    '{ foo: { bar: foo } }' => ['foo' => ['bar' => 'foo']],
 
-    '[foo, { bar: foo }]' => array('foo', array('bar' => 'foo')),
+    '[foo, { bar: foo }]' => ['foo', ['bar' => 'foo']],
 
-    '[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]' => array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo'))),
-);
+    '[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]' => ['foo', ['bar' => 'foo', 'foo' => ['foo', ['bar' => 'foo']]], ['foo', ['bar' => 'foo']]],
+];
 
 // ::dump()
 $t->diag('::dump()');
 foreach ($testsForDump as $yaml => $value) {
-    $t->is(sfYamlInline::dump($value), $yaml, sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
+    $t->is(\sfYamlInline::dump($value), $yaml, sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
 }
 
 foreach ($testsForLoad as $yaml => $value) {
@@ -127,7 +128,7 @@
         continue;
     }
 
-    $t->is_deeply(sfYamlInline::load(sfYamlInline::dump($value)), $value, 'check consistency');
+    $t->is_deeply(\sfYamlInline::load(\sfYamlInline::dump($value)), $value, 'check consistency');
 }
 
 foreach ($testsForDump as $yaml => $value) {
@@ -135,5 +136,5 @@
         continue;
     }
 
-    $t->is_deeply(sfYamlInline::load(sfYamlInline::dump($value)), $value, 'check consistency');
+    $t->is_deeply(\sfYamlInline::load(\sfYamlInline::dump($value)), $value, 'check consistency');
 }
diff --git a/test/unit/yaml/sfYamlParserTest.php b/test/unit/yaml/sfYamlParserTest.php
index 29c93a9cd..7bc745af2 100644
--- a/test/unit/yaml/sfYamlParserTest.php
+++ b/test/unit/yaml/sfYamlParserTest.php
@@ -1,8 +1,9 @@
 <?php
 
 /*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * This file is part of the Symfony1 package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,11 +11,11 @@
 
 require_once __DIR__.'/../../bootstrap/unit.php';
 
-sfYaml::setSpecVersion('1.1');
+\sfYaml::setSpecVersion('1.1');
 
-$t = new lime_test(150);
+$t = new \lime_test(150);
 
-$parser = new sfYamlParser();
+$parser = new \sfYamlParser();
 
 $path = __DIR__.'/fixtures';
 $files = $parser->parse(file_get_contents($path.'/index.yml'));
@@ -41,18 +42,18 @@
 }
 
 // test tabs in YAML
-$yamls = array(
+$yamls = [
     "foo:\n	bar",
     "foo:\n 	bar",
     "foo:\n	 bar",
     "foo:\n 	 bar",
-);
+];
 
 foreach ($yamls as $yaml) {
     try {
         $content = $parser->parse($yaml);
         $t->fail('YAML files must not contain tabs');
-    } catch (InvalidArgumentException $e) {
+    } catch (\InvalidArgumentException $e) {
         $t->pass('YAML files must not contain tabs');
     }
 }
@@ -71,7 +72,7 @@ class A
 {
     public $a = 'foo';
 }
-$a = array('foo' => new A(), 'bar' => 1);
+$a = ['foo' => new \A(), 'bar' => 1];
 $t->is($parser->parse(
     <<<'EOF'
 foo: !!php/object:O:1:"A":1:{s:1:"a";s:3:"foo";}